Merge pull request #83 from yodalee/feature-clean-maindirectory-include

clean redundant include in main directory

qucs/element.cpp

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "element.h"
-//#include "schematic.h"
+
 Element::Element()
 {
   Type = isDummyElement;

qucs/main.h

@@ -24,13 +24,11 @@
 
 #include <QFont>
 #include <QColor>
-#include <Q3PtrList>
 #include <QStringList>
 
 #include "wire.h"
 #include "node.h"
 #include "diagrams/diagram.h"
-#include <QSettings>
 
 class QucsApp;
 class Component;

qucs/messagedock.cpp

@@ -21,8 +21,6 @@
 #include "qucsdoc.h"
 #include "textdoc.h"
 
-#include <QVBoxLayout>
-
 /*!
  * \file messagedock.cpp
  * \brief Definition of the MessageDock class.

qucs/messagedock.h

@@ -22,8 +22,8 @@
 
 #include <QWidget>
 
-#include <QDockWidget>
-#include <QTabWidget>
+class QDockWidget;
+class QTabWidget;
 
 /*!
  * \file messagedock.h

qucs/mnemo.cpp

@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "mnemo.h"
+#include <QString>
 
 struct tSpecialChar {
      char Mnemonic[16];

qucs/mnemo.h

@@ -18,7 +18,7 @@
 #ifndef MNEMO_H
 #define MNEMO_H
 
-#include <QString>
+class QString;
 
 void encode_String(const QString&, QString&);
 void decode_String(QString&);

qucs/module.cpp

@@ -18,7 +18,6 @@
 #include <Q3Dict>
 #include <QString>
 #include <QStringList>
-//Added by qt3to4:
 #include <Q3PtrList>
 
 #include "element.h"

qucs/module.h

@@ -1,7 +1,3 @@
-//Added by qt3to4:
-#include <Q3PtrList>
-#include <Q3Dict>
-#include <QMap>
 /***************************************************************************
                                module.h
                               ----------
@@ -22,6 +18,10 @@
 #ifndef MODULE_H
 #define MODULE_H
 
+#include <Q3PtrList>
+#include <Q3Dict>
+#include <QMap>
+
 // function typedefs for circuits and analyses
 typedef Element * (* pInfoFunc) (QString&, char * &, bool);
 typedef Element * (* pInfoVAFunc) (QString&, QString&, bool, QString);

qucs/mouseactions.cpp

@@ -18,9 +18,6 @@
  ***************************************************************************/
 #include <QtGui>
 #include "qucs.h"
-#include <QTextStream>
-#include <Q3PtrList>
-#include <QMouseEvent>
 #include "main.h"
 #include "node.h"
 #include "schematic.h"
@@ -38,14 +35,15 @@
 #include "diagrams/timingdiagram.h"
 #include "dialogs/labeldialog.h"
 
-#include <QInputDialog>
+#include <QTextStream>
+#include <Q3PtrList>
+#include <QMouseEvent>
 #include <QClipboard>
 #include <QApplication>
 #include <QMessageBox>
 #include <Q3PopupMenu>
 #include <QEvent>
 #include <QAction>
-#include <QTabWidget>
 
 #include <limits.h>
 #include <stdlib.h>

qucs/mouseactions.h

@@ -21,10 +21,6 @@
 #include "element.h"
 
 #include <Q3PtrList>
-//Added by qt3to4:
-#include <QMouseEvent>
-#include <Q3PopupMenu>
-
 
 class Wire;
 class Schematic;

qucs/node.h

@@ -23,8 +23,6 @@
 #include <Q3PtrList>
 
 class ViewPainter;
-class WireLabel;
-class QPainter;
 
 
 class Node : public Conductor {

qucs/octave_window.h

@@ -9,10 +9,11 @@
 #include <QWidget>
 #include <QProcess>
 #include <QStringList>
-#include <QKeyEvent>
-#include <QDockWidget>
-#include <QTextEdit>
-#include <QLineEdit>
+
+class QEvent;
+class QDockWidget;
+class QTextEdit;
+class QLineEdit;
 
 
 class OctaveWindow : public QWidget {

qucs/qucs.cpp

@@ -25,10 +25,7 @@
 #include <limits.h>
 
 #include <QProcess>
-#include <Q3SyntaxHighlighter>
-//Added by qt3to4:
 #include <Q3PtrList>
-#include <Q3TextEdit>
 
 #include "main.h"
 #include "qucs.h"

qucs/qucs.h

@@ -19,40 +19,30 @@
 #define QUCS_H
 
 #include <QtGui>
-//#include <Q3MainWindow>
 #include <QMainWindow>
 #include <QString>
-#include <QDir>
-//Added by qt3to4:
-#include <QLabel>
 #include <Q3PtrList>
-//#include <Q3PopupMenu>
-#include <QMouseEvent>
-#include <QCloseEvent>
-#include <Q3ScrollView>
-#include <QMenu>
-#include <QToolBar>
-#include <QAction>
-#include <QTabWidget>
-#include <QDockWidget>
-//#include <QListWidget>
-#include <QSettings>
 
 class QucsDoc;
 class Schematic;
 class SimMessage;
 class MouseActions;
 class SearchDialog;
+class OctaveWindow;
+class MessageDock;
+
 class QLabel;
 class QAction;
 class QPrinter;
 class QLineEdit;
 class QComboBox;
 class QTabWidget;
-class Q3ListView;
-class Q3ListViewItem;
-class OctaveWindow;
-class MessageDock;
+class QDir;
+class QMouseEvent;
+class QCloseEvent;
+class QMenu;
+class QToolBar;
+class QSettings;
 
 typedef bool (Schematic::*pToggleFunc) ();
 typedef void (MouseActions::*pMouseFunc) (Schematic*, QMouseEvent*);

qucs/syntax.h

@@ -22,7 +22,6 @@
 #include <QtGui>
 
 #include "textdoc.h"
-//#include "main.h"
 
 enum language_type {
   LANG_NONE = 0,

qucs/viewpainter.h

@@ -18,7 +18,7 @@
 #ifndef VIEWPAINTER_H
 #define VIEWPAINTER_H
 
-#include <QPainter>
+class QPainter;
 
 #define TO_INT(f)   (f > 0.0 ? int(f + 0.5) : int(f - 0.5))
 

qucs/wire.h

@@ -23,9 +23,8 @@
 #include "components/component.h"    // because of struct Port
 #include "wirelabel.h"
 
-#include <QPainter>
-#include <QString>
-#include <Q3PtrList>
+class QPainter;
+class QString;
 
 
 class Wire : public Conductor {

qucs/wirelabel.cpp

@@ -23,6 +23,7 @@
 #include "qucs.h"
 #include "schematic.h"
 
+#include <QString>
 
 WireLabel::WireLabel(const QString& _Name, int _cx, int _cy,
                      int _x1, int _y1, int _Type)

qucs/wirelabel.h

@@ -21,10 +21,9 @@
 #include "element.h"
 #include "viewpainter.h"
 
-#include <QPainter>
 #include <QString>
-#include <Q3PtrList>
 
+class QPainter;
 class Wire;
 class Node;