Header cleanup in coreplugin, part 1

1 files changed, 9 insertions, 106 deletions

diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h
index ba52693661..89881f20aa 100644
--- a/src/plugins/coreplugin/outputpane.h
+++ b/src/plugins/coreplugin/outputpane.h
@@ -32,28 +32,22 @@
 
 #include "core_global.h"
 
-#include <QtCore/QMap>
-#include <QtGui/QPushButton>
 #include <QtGui/QWidget>
 
+#include <QtCore/QScopedPointer>
+
 QT_BEGIN_NAMESPACE
-class QAction;
-class QComboBox;
-class QToolButton;
-class QStackedWidget;
 class QSplitter;
 QT_END_NAMESPACE
 
 namespace Core {
 
 class IMode;
-class IOutputPane;
 
 namespace Internal {
 class OutputPaneManager;
-class MainWindow;
 }
-
+struct OutputPanePlaceHolderPrivate;
 
 class CORE_EXPORT OutputPanePlaceHolder : public QWidget
 {
@@ -62,116 +56,25 @@ class CORE_EXPORT OutputPanePlaceHolder : public QWidget
 public:
     explicit OutputPanePlaceHolder(Core::IMode *mode, QSplitter *parent = 0);
     ~OutputPanePlaceHolder();
+
     void setCloseable(bool b);
     bool closeable();
-    static OutputPanePlaceHolder *getCurrent() { return m_current; }
+    static OutputPanePlaceHolder *getCurrent();
+    static bool isCurrentVisible();
 
     void unmaximize();
     bool isMaximized() const;
 
 private slots:
     void currentModeChanged(Core::IMode *);
-private:
-    inline bool canMaximizeOrMinimize() const { return m_splitter != 0; }
-    void maximizeOrMinimize(bool maximize);
-    Core::IMode *m_mode;
-    QSplitter *m_splitter;
-    bool m_closeable;
-    static OutputPanePlaceHolder* m_current;
-};
-
-namespace Internal {
-
-class OutputPaneManager : public QWidget
-{
-    Q_OBJECT
-
-public:
-    void init();
-    static OutputPaneManager *instance();
-    void setCloseable(bool b);
-    bool closeable();
-    QWidget *buttonsWidget();
-    void updateStatusButtons(bool visible);
-
-    bool isMaximized()const;
-
-public slots:
-    void slotHide();
-    void slotNext();
-    void slotPrev();
-    void shortcutTriggered();
-    void slotMinMax();
-
-protected:
-    void focusInEvent(QFocusEvent *e);
-
-private slots:
-    void changePage();
-    void showPage(bool focus);
-    void togglePage(bool focus);
-    void clearPage();
-    void buttonTriggered();
-    void updateNavigateState();
 
 private:
-    // the only class that is allowed to create and destroy
-    friend class MainWindow;
-
-    static void create();
-    static void destroy();
-
-    OutputPaneManager(QWidget *parent = 0);
-    ~OutputPaneManager();
-
-    void showPage(int idx, bool focus);
-    void ensurePageVisible(int idx);
-    int findIndexForPage(IOutputPane *out);
-    QComboBox *m_widgetComboBox;
-    QToolButton *m_clearButton;
-    QToolButton *m_closeButton;
-
-    QAction *m_minMaxAction;
-    QToolButton *m_minMaxButton;
-
-    QAction *m_nextAction;
-    QAction *m_prevAction;
-    QToolButton *m_prevToolButton;
-    QToolButton *m_nextToolButton;
-    QWidget *m_toolBar;
-
-    QMap<int, Core::IOutputPane*> m_pageMap;
-    int m_lastIndex;
-
-    QStackedWidget *m_outputWidgetPane;
-    QStackedWidget *m_opToolBarWidgets;
-    QWidget *m_buttonsWidget;
-    QMap<int, QPushButton *> m_buttons;
-    QMap<QAction *, int> m_actions;
-    QPixmap m_minimizeIcon;
-    QPixmap m_maximizeIcon;
-    bool m_maximised;
-};
-
-class OutputPaneToggleButton : public QPushButton
-{
-    Q_OBJECT
-public:
-    OutputPaneToggleButton(int number, const QString &text, QAction *action,
-                           QWidget *parent = 0);
-    QSize sizeHint() const;
-    void paintEvent(QPaintEvent *event);
-
-private slots:
-    void updateToolTip();
+    bool canMaximizeOrMinimize() const;
+    void maximizeOrMinimize(bool maximize);
 
-private:
-    QString m_number;
-    QString m_text;
-    QAction *m_action;
+    QScopedPointer<OutputPanePlaceHolderPrivate> d;
 };
 
-} // namespace Internal
 } // namespace Core
 
 #endif // OUTPUTPANE_H