From: Peter Penz Date: Thu, 27 Sep 2007 12:44:14 +0000 (+0000) Subject: use inline keyword as suggested at http://www.parashift.com/c%2B%2B-faq-lite/inline... X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f37aaf794846121dd77e770b27c9c9eafb375c3f use inline keyword as suggested at http://www.parashift.com/c%2B%2B-faq-lite/inline-functions.html#faq-9.9 svn path=/trunk/KDE/kdebase/apps/; revision=717738 --- diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp index b87be9afc..150858693 100644 --- a/src/dolphincolumnview.cpp +++ b/src/dolphincolumnview.cpp @@ -71,7 +71,7 @@ public: void setUrl(const KUrl& url); /** Returns the directory URL that is shown inside the column widget. */ - inline const KUrl& url() const; + const KUrl& url() const; protected: virtual QStyleOptionViewItem viewOptions() const; @@ -195,12 +195,12 @@ inline void ColumnWidget::setUrl(const KUrl& url) m_url = url; } -const KUrl& ColumnWidget::url() const +inline const KUrl& ColumnWidget::url() const { return m_url; } -QStyleOptionViewItem ColumnWidget::viewOptions() const +inline QStyleOptionViewItem ColumnWidget::viewOptions() const { return m_viewOptions; } diff --git a/src/dolphincolumnview.h b/src/dolphincolumnview.h index a95ccfcae..1a59e3919 100644 --- a/src/dolphincolumnview.h +++ b/src/dolphincolumnview.h @@ -135,7 +135,7 @@ private: bool isZoomInPossible() const; bool isZoomOutPossible() const; - inline ColumnWidget* activeColumn() const; + ColumnWidget* activeColumn() const; /** * Deactivates the currently active column and activates @@ -176,7 +176,7 @@ private: friend class ColumnWidget; }; -ColumnWidget* DolphinColumnView::activeColumn() const +inline ColumnWidget* DolphinColumnView::activeColumn() const { return m_columns[m_index]; } diff --git a/src/dolphincontroller.h b/src/dolphincontroller.h index a7f227306..d17f34c75 100644 --- a/src/dolphincontroller.h +++ b/src/dolphincontroller.h @@ -59,7 +59,7 @@ public: /** Sets the URL to \a url and emits the signal urlChanged(). */ void setUrl(const KUrl& url); - inline const KUrl& url() const; + const KUrl& url() const; void triggerContextMenuRequest(const QPoint& pos); @@ -75,18 +75,18 @@ public: void indicateSortOrderChange(Qt::SortOrder order); void setShowPreview(bool show); - inline bool showPreview() const; + bool showPreview() const; void setShowAdditionalInfo(bool show); - inline bool showAdditionalInfo() const; + bool showAdditionalInfo() const; void triggerZoomIn(); - inline void setZoomInPossible(bool possible); - inline bool isZoomInPossible() const; + void setZoomInPossible(bool possible); + bool isZoomInPossible() const; void triggerZoomOut(); - inline void setZoomOutPossible(bool possible); - inline bool isZoomOutPossible() const; + void setZoomOutPossible(bool possible); + bool isZoomOutPossible() const; // TODO: remove this method when the issue #160611 is solved in Qt 4.4 static void drawHoverIndication(QWidget* widget, @@ -194,37 +194,37 @@ private: KUrl m_url; }; -const KUrl& DolphinController::url() const +inline const KUrl& DolphinController::url() const { return m_url; } -bool DolphinController::showPreview() const +inline bool DolphinController::showPreview() const { return m_showPreview; } -bool DolphinController::showAdditionalInfo() const +inline bool DolphinController::showAdditionalInfo() const { return m_showAdditionalInfo; } -void DolphinController::setZoomInPossible(bool possible) +inline void DolphinController::setZoomInPossible(bool possible) { m_zoomInPossible = possible; } -bool DolphinController::isZoomInPossible() const +inline bool DolphinController::isZoomInPossible() const { return m_zoomInPossible; } -void DolphinController::setZoomOutPossible(bool possible) +inline void DolphinController::setZoomOutPossible(bool possible) { m_zoomOutPossible = possible; } -bool DolphinController::isZoomOutPossible() const +inline bool DolphinController::isZoomOutPossible() const { return m_zoomOutPossible; } diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 81b8f02c1..6e6c4269b 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -60,14 +60,14 @@ public: * having a split view setup, the nonactive view * is usually shown in darker colors. */ - inline DolphinViewContainer* activeViewContainer() const; + DolphinViewContainer* activeViewContainer() const; /** * Returns true, if the main window contains two instances * of a view container. The active view constainer can be * accessed by DolphinMainWindow::activeViewContainer(). */ - inline bool isSplit() const; + bool isSplit() const; /** * If the main window contains two instances of a view container @@ -90,7 +90,7 @@ public: * Returns the 'Create New...' sub menu which also can be shared * with other menus (e. g. a context menu). */ - inline KNewMenu* newMenu() const; + KNewMenu* newMenu() const; public slots: /** @@ -110,7 +110,7 @@ public slots: /** * Returns the main window ID used through DBus. */ - inline int getId() const; + int getId() const; /** * Inform all affected dolphin components (sidebars, views) of an URL @@ -500,22 +500,22 @@ private: QList m_undoCommandTypes; }; -DolphinViewContainer* DolphinMainWindow::activeViewContainer() const +inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const { return m_activeViewContainer; } -bool DolphinMainWindow::isSplit() const +inline bool DolphinMainWindow::isSplit() const { return m_viewContainer[SecondaryView] != 0; } -KNewMenu* DolphinMainWindow::newMenu() const +inline KNewMenu* DolphinMainWindow::newMenu() const { return m_newMenu; } -int DolphinMainWindow::getId() const +inline int DolphinMainWindow::getId() const { return m_id; } diff --git a/src/dolphinsortfilterproxymodel.h b/src/dolphinsortfilterproxymodel.h index d40dd17c1..254a90c80 100644 --- a/src/dolphinsortfilterproxymodel.h +++ b/src/dolphinsortfilterproxymodel.h @@ -51,10 +51,10 @@ public: virtual ~DolphinSortFilterProxyModel(); void setSorting(DolphinView::Sorting sorting); - inline DolphinView::Sorting sorting() const; + DolphinView::Sorting sorting() const; void setSortOrder(Qt::SortOrder sortOrder); - inline Qt::SortOrder sortOrder() const; + Qt::SortOrder sortOrder() const; /** * @reimplemented, @internal @@ -99,12 +99,12 @@ private: Qt::SortOrder m_sortOrder:16; }; -DolphinView::Sorting DolphinSortFilterProxyModel::sorting() const +inline DolphinView::Sorting DolphinSortFilterProxyModel::sorting() const { return m_sorting; } -Qt::SortOrder DolphinSortFilterProxyModel::sortOrder() const +inline Qt::SortOrder DolphinSortFilterProxyModel::sortOrder() const { return m_sortOrder; } diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 3cfa907c7..86c6aae06 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -98,8 +98,8 @@ public: KFileItem fileItem(const QModelIndex& index) const; - inline const DolphinStatusBar* statusBar() const; - inline DolphinStatusBar* statusBar(); + const DolphinStatusBar* statusBar() const; + DolphinStatusBar* statusBar(); /** * Returns true, if the URL shown by the navigation bar is editable. @@ -107,11 +107,11 @@ public: */ bool isUrlEditable() const; - inline const KUrlNavigator* urlNavigator() const; - inline KUrlNavigator* urlNavigator(); + const KUrlNavigator* urlNavigator() const; + KUrlNavigator* urlNavigator(); - inline const DolphinView* view() const; - inline DolphinView* view(); + const DolphinView* view() const; + DolphinView* view(); /** Returns true, if the filter bar is visible. */ bool isFilterBarVisible() const; @@ -120,7 +120,7 @@ public: * Return the DolphinMainWindow this View belongs to. It is guaranteed * that we have one. */ - inline const DolphinMainWindow* mainWindow() const; + const DolphinMainWindow* mainWindow() const; public slots: /** @@ -247,38 +247,39 @@ private: DolphinSortFilterProxyModel* m_proxyModel; }; -const DolphinStatusBar* DolphinViewContainer::statusBar() const +inline const DolphinStatusBar* DolphinViewContainer::statusBar() const { return m_statusBar; } -DolphinStatusBar* DolphinViewContainer::statusBar() +inline DolphinStatusBar* DolphinViewContainer::statusBar() { return m_statusBar; } -const KUrlNavigator* DolphinViewContainer::urlNavigator() const +inline const KUrlNavigator* DolphinViewContainer::urlNavigator() const { return m_urlNavigator; } -KUrlNavigator* DolphinViewContainer::urlNavigator() +inline KUrlNavigator* DolphinViewContainer::urlNavigator() { return m_urlNavigator; } -const DolphinView* DolphinViewContainer::view() const +inline const DolphinView* DolphinViewContainer::view() const { return m_view; } -DolphinView* DolphinViewContainer::view() +inline DolphinView* DolphinViewContainer::view() { return m_view; } -const DolphinMainWindow* DolphinViewContainer::mainWindow() const +inline const DolphinMainWindow* DolphinViewContainer::mainWindow() const { return m_mainWindow; } + #endif // DOLPHINVIEWCONTAINER_H diff --git a/src/pixmapviewer.h b/src/pixmapviewer.h index ba0dda9cd..01d8cf1c1 100644 --- a/src/pixmapviewer.h +++ b/src/pixmapviewer.h @@ -64,7 +64,7 @@ public: virtual ~PixmapViewer(); void setPixmap(const QPixmap& pixmap); - inline const QPixmap& pixmap() const; + const QPixmap& pixmap() const; protected: virtual void paintEvent(QPaintEvent* event); @@ -81,7 +81,7 @@ private: int m_animationStep; }; -const QPixmap& PixmapViewer::pixmap() const +inline const QPixmap& PixmapViewer::pixmap() const { return m_pixmap; }