Paint icons at the correct size

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 8c8d42ee41f78d1a2be23c22bbbecc06a3ef83e9..5066657ef8865137c9483c5c5b8733c9bf63b7cf 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -31,12 +31,11 @@
 #include <QUrl>
 
 #include <QList>
-#include <QWeakPointer>
+#include <QPointer>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinViewActionHandler;
-class DolphinApplication;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
@@ -58,7 +57,6 @@ class DolphinMainWindow: public KXmlGuiWindow
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
     Q_PROPERTY(int id READ getId SCRIPTABLE true)
-    friend class DolphinApplication;
 
 public:
     DolphinMainWindow();
@@ -121,6 +119,11 @@ public slots:
     /** Stores all settings and quits Dolphin. */
     void quit();
 
+    /**
+     * Opens a new tab showing the URL \a url and activates the tab.
+     */
+    void openNewActivatedTab(const QUrl& url);
+
 signals:
     /**
      * Is sent if the selection of the currently active view has
@@ -335,11 +338,6 @@ private slots:
      */
     void openNewTab(const QUrl& url);
 
-    /**
-     * Opens a new tab showing the URL \a url and activates the tab.
-     */
-    void openNewActivatedTab(const QUrl& url);
-
     /**
      * Opens the selected folder in a new tab.
      */
@@ -495,7 +493,7 @@ private:
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
-    QWeakPointer<DolphinSettingsDialog> m_settingsDialog;
+    QPointer<DolphinSettingsDialog> m_settingsDialog;
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QToolButton* m_controlButton;