Fix several Qt3 deprecated header inclusion

2025-03-28 21:13:26 +00:00 · 2013-11-26 17:28:48 +01:00 · 2013-11-26 17:28:48 +01:00 · b0d7cce0b7
commit b0d7cce0b7
parent edde902512
48 changed files with 80 additions and 80 deletions
--- a/qucs-filter-v2/qf_box.cpp
+++ b/qucs-filter-v2/qf_box.cpp
@ -7,14 +7,14 @@
 #include "qf_box.h"
 #include "qf_dialog.h"

-#include <q3button.h>
+#include <Q3Button>
 #include <QComboBox>
 #include <QLineEdit>
 #include <QCheckBox>
 #include <QLabel>
 #include <QValidator>
 #include <QPushButton>
-#include <q3buttongroup.h>
+#include <Q3ButtonGroup>
 #include <qradiobutton.h>

 // static  QButton::ToggleState  OrderBoxState = QButton::Off;
--- a/qucs-filter-v2/qf_common.h
+++ b/qucs-filter-v2/qf_common.h
@ -16,7 +16,7 @@
 #include <iomanip>
 #include <string>
 #include <typeinfo>
-#include <q3textstream.h>
+#include <Q3TextStream>

 using namespace std;

--- a/qucs-filter-v2/qf_comp.h
+++ b/qucs-filter-v2/qf_comp.h
@ -3,7 +3,7 @@

 #include <vector>
 #include <list>
-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QString>

 using namespace std;
--- a/qucs-filter-v2/qf_dialog.cpp
+++ b/qucs-filter-v2/qf_dialog.cpp
@ -19,7 +19,7 @@
 # include <config.h>
 #endif

-#include <q3popupmenu.h>
+#include <Q3PopupMenu>
 #include <QMenuBar>
 #include <QLayout>
 #include <QTabWidget>
@ -28,9 +28,9 @@
 #include <QLabel>
 #include <QCheckBox>
 #include <qradiobutton.h>
-#include <q3buttongroup.h>
+#include <Q3ButtonGroup>
 #include <QPushButton>
-#include <q3hbox.h>
+#include <Q3HBox>
 #include <QMessageBox>

 #include "qf_dialog.h"
--- a/qucs-filter-v2/qf_filter.h
+++ b/qucs-filter-v2/qf_filter.h
@ -22,7 +22,7 @@
 # define PACKAGE_VERSION "Qf test"
 # endif

-# include <q3textstream.h>
+# include <Q3TextStream>

 using namespace std;

--- a/qucs-filter-v2/qf_main.cpp
+++ b/qucs-filter-v2/qf_main.cpp
@ -3,10 +3,10 @@
 #endif

 #include <QBuffer>
-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QObject>
 #include <QApplication>
-#include <q3textedit.h>
+#include <Q3TextEdit>
 #include <QDir>
 #include <QTextCodec>
 #include <QClipboard>
--- a/qucs-help/htmldatafetcher.cpp
+++ b/qucs-help/htmldatafetcher.cpp
@ -19,7 +19,7 @@

 #include "htmldatafetcher.h"
 #include <QMimeData>
-#include <q3dragobject.h>
+#include <Q3DragObject>
 //Added by qt3to4:
 #include <Q3TextStream>
 #include <Q3MimeSourceFactory>
--- a/qucs-help/main.cpp
+++ b/qucs-help/main.cpp
@ -26,7 +26,7 @@
 #include <QTextCodec>
 #include <QTranslator>
 #include <QFile>
-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QMessageBox>
 #include <QDir>
 #include <QFont>
--- a/qucs-help/qucshelp.cpp
+++ b/qucs-help/qucshelp.cpp
@ -26,11 +26,11 @@
 #include <QAction>
 #include <QPixmap>
 #include <QFile>
-#include <q3textstream.h>
-#include <q3popupmenu.h>
+#include <Q3TextStream>
+#include <Q3PopupMenu>
 #include <QMenuBar>
 #include <QApplication>
-#include <q3listview.h>
+#include <Q3ListView>



--- a/qucs-help/qucshelp.h
+++ b/qucs-help/qucshelp.h
@ -18,8 +18,8 @@
 #ifndef QUCSHELP_H
 #define QUCSHELP_H

-#include <q3mainwindow.h>
-#include <q3textbrowser.h>
+#include <Q3MainWindow>
+#include <Q3TextBrowser>
 #include <QDir>
 #include <QFont>
 #include <QStringList>
--- a/qucs-lib/librarydialog.cpp
+++ b/qucs-lib/librarydialog.cpp
@ -28,7 +28,7 @@
 #include <QValidator>
 #include <QMessageBox>
 #include <QPushButton>
-//#include <q3scrollview.h> //-->QAbstractScrollArea and QScrollArea
+//#include <Q3ScrollView> //-->QAbstractScrollArea and QScrollArea
 #include <QRadioButton>
 #include <QButtonGroup>
 #include <QVBoxLayout>
--- a/qucs-lib/symbolwidget.cpp
+++ b/qucs-lib/symbolwidget.cpp
@ -19,7 +19,7 @@
 #include <limits.h>

 #include <QPainter>
-//#include <q3dragobject.h>
+//#include <Q3DragObject>
 //Added by qt3to4:
 #include <QPaintEvent>
 #include <QPixmap>
--- a/qucs/components/component.cpp
+++ b/qucs/components/component.cpp
@ -25,7 +25,7 @@
 #include <QTabWidget>
 #include <QMessageBox>
 #include <QDom>
-#include <q3dict.h>
+#include <Q3Dict>

 #include "components.h"
 #include "node.h"
--- a/qucs/components/component.h
+++ b/qucs/components/component.h
@ -18,7 +18,7 @@
 #ifndef COMPONENT_H
 #define COMPONENT_H

-#include <q3ptrlist.h>
+#include <Q3PtrList>
 #include <QPen>
 #include <QPoint>
 #include <QWidget>
--- a/qucs/components/componentdialog.cpp
+++ b/qucs/components/componentdialog.cpp
@ -19,19 +19,19 @@
 #include "main.h"
 #include "qucs.h"
 //Added by qt3to4:
-#include <q3button.h>
+#include <Q3Button>
 #include <QLabel>
 #include <Q3GridLayout>
 #include <Q3VBoxLayout>
 #include "schematic.h"

-#include <q3hbox.h>
-#include <q3vbox.h>
+#include <Q3HBox>
+#include <Q3VBox>
 #include <QLayout>
-#include <q3hgroupbox.h>
+#include <Q3HGroupBox>
 #include <QValidator>
 #include <QTabWidget>
-#include <q3filedialog.h>
+#include <Q3FileDialog>

 #include <math.h>

--- a/qucs/components/componentdialog.h
+++ b/qucs/components/componentdialog.h
@ -21,13 +21,13 @@
 #include "component.h"
 #include <QLabel>
 #include <QDialog>
-#include <q3listview.h>
+#include <Q3ListView>
 #include <QLineEdit>
 #include <QCheckBox>
 #include <QRegExp>
 #include <QComboBox>
 #include <QPushButton>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 #include <QDir>
 //Added by qt3to4:
 #include <Q3GridLayout>
--- a/qucs/components/opt_sim.cpp
+++ b/qucs/components/opt_sim.cpp
@ -17,7 +17,7 @@
 #include <QtGui>
 #include <QDir>
 #include <QFile>
-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QRegExp>
 #include <QString>
 #include <QStringList>
--- a/qucs/components/optimizedialog.cpp
+++ b/qucs/components/optimizedialog.cpp
@ -23,13 +23,13 @@
 #include "opt_sim.h"
 #include "schematic.h"

-#include <q3hbox.h>
+#include <Q3HBox>
 #include <QLabel>
 #include <QLayout>
 #include <QCheckBox>
 #include <QLineEdit>
 #include <QComboBox>
-#include <q3listview.h>
+#include <Q3ListView>
 #include <QTabWidget>
 #include <QValidator>
 #include <QPushButton>
--- a/qucs/components/spicedialog.cpp
+++ b/qucs/components/spicedialog.cpp
@ -27,13 +27,13 @@

 #include <QLabel>
 #include <QLayout>
-#include <q3hbox.h>
-#include <q3vbox.h>
+#include <Q3HBox>
+#include <Q3VBox>
 #include <QLineEdit>
 #include <QValidator>
-#include <q3filedialog.h>
+#include <Q3FileDialog>
 #include <QPushButton>
-#include <q3listbox.h>
+#include <Q3ListBox>
 #include <QCheckBox>
 #include <QProcess>
 #include <QMessageBox>
--- a/qucs/components/spicefile.cpp
+++ b/qucs/components/spicefile.cpp
@ -28,7 +28,7 @@
 #include <QString>
 #include <QStringList>
 #include <QMessageBox>
-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QFile>
 #include <QDir>
 #include <QFileInfo>
--- a/qucs/diagrams/diagram.cpp
+++ b/qucs/diagrams/diagram.cpp
@ -27,7 +27,7 @@
 #endif
 #include <locale.h>

-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QMessageBox>
 #include <QRegExp>
 #include <QDateTime>
--- a/qucs/diagrams/diagramdialog.cpp
+++ b/qucs/diagrams/diagramdialog.cpp
@ -26,25 +26,25 @@

 #include <math.h>

-#include <q3vbox.h>
+#include <Q3VBox>
 #include <QLayout>
-//#include <q3hbuttongroup.h>
-#include <q3buttongroup.h>
-#include <q3hgroupbox.h>
+//#include <Q3HButtonGroup>
+#include <Q3ButtonGroup>
+#include <Q3HGroupBox>
 #include <QPushButton>
 #include <QTabWidget>
 #include <QLabel>
 #include <QStringList>
 #include <QMessageBox>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 #include <QValidator>
 #include <QColorDialog>
 #include <QLineEdit>
 #include <QCheckBox>
 #include <QSlider>
 #include <QComboBox>
-#include <q3listview.h>
-#include <q3listbox.h>
+#include <Q3ListView>
+#include <Q3ListBox>


 #define CROSS3D_SIZE   30
--- a/qucs/diagrams/graph.h
+++ b/qucs/diagrams/graph.h
@ -23,7 +23,7 @@
 #include "element.h"

 #include <QColor>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 #include <QDateTime>


--- a/qucs/diagrams/marker.h
+++ b/qucs/diagrams/marker.h
@ -23,7 +23,7 @@
 #include "viewpainter.h"

 #include <QPainter>
-#include <q3valuelist.h>
+#include <Q3ValueList>

 class Diagram;
 class Graph;
--- a/qucs/diagrams/markerdialog.cpp
+++ b/qucs/diagrams/markerdialog.cpp
@ -19,7 +19,7 @@

 #include <QLayout>
 #include <QLabel>
-#include <q3hbox.h>
+#include <Q3HBox>
 #include <QPushButton>
 #include <QValidator>
 //Added by qt3to4:
--- a/qucs/dialogs/sweepdialog.h
+++ b/qucs/dialogs/sweepdialog.h
@ -20,7 +20,7 @@

 #include <QDialog>
 #include <QRegExp>
-#include <q3ptrlist.h>
+#include <Q3PtrList>

 #include <QSpinBox>
 #include <QGridLayout>
--- a/qucs/dialogs/vtabbar.h
+++ b/qucs/dialogs/vtabbar.h
@ -23,7 +23,7 @@
 #include "vtabglobal.h"
 #include "vtabbutton.h"
 #include <QWidget>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 //Added by qt3to4:
 #include <Q3VBoxLayout>

--- a/qucs/dialogs/vtabbeddockwidget.cpp
+++ b/qucs/dialogs/vtabbeddockwidget.cpp
@ -20,7 +20,7 @@
 #include "vtabbeddockwidget.h"
 #include "vtabwidget.h"
 #include <QApplication>
-#include <q3mainwindow.h>
+#include <Q3MainWindow>

 VTabbedDockWidget::VTabbedDockWidget(Place p, QWidget* parent, const char* name): Q3DockWindow(p, parent, name)
 {
--- a/qucs/dialogs/vtabbeddockwidget.h
+++ b/qucs/dialogs/vtabbeddockwidget.h
@ -21,7 +21,7 @@
 #define VTABBEDDOCKWIDGET_H

 #include "vtabglobal.h"
-#include <q3dockwindow.h>
+#include <Q3DockWindow>

 class VTabWidget;

--- a/qucs/dialogs/vtabwidget.cpp
+++ b/qucs/dialogs/vtabwidget.cpp
@ -22,7 +22,7 @@
 #include "vtabwidget.h"

 #include <QLayout>
-#include <q3widgetstack.h>
+#include <Q3WidgetStack>
 //Added by qt3to4:
 #include <Q3HBoxLayout>

--- a/qucs/main.cpp
+++ b/qucs/main.cpp
@ -30,7 +30,7 @@
 #include <QTextCodec>
 #include <QTranslator>
 #include <QFile>
-#include <q3textstream.h>
+#include <Q3TextStream>
 #include <QMessageBox>
 #include <QRegExp>

--- a/qucs/main.h
+++ b/qucs/main.h
@ -20,7 +20,7 @@

 #include <QFont>
 #include <QColor>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 #include <QStringList>

 #include "wire.h"
--- a/qucs/module.cpp
+++ b/qucs/module.cpp
@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/
 #include <QtGui>
-#include <q3dict.h>
+#include <Q3Dict>
 #include <QString>
 #include <QStringList>
 //Added by qt3to4:
--- a/qucs/mouseactions.cpp
+++ b/qucs/mouseactions.cpp
@ -39,7 +39,7 @@
 #include <QClipboard>
 #include <QApplication>
 #include <QMessageBox>
-#include <q3popupmenu.h>
+#include <Q3PopupMenu>
 #include <QEvent>
 #include <QAction>
 #include <QTabWidget>
--- a/qucs/mouseactions.h
+++ b/qucs/mouseactions.h
@ -20,7 +20,7 @@

 #include "element.h"

-#include <q3ptrlist.h>
+#include <Q3PtrList>
 //Added by qt3to4:
 #include <QMouseEvent>
 #include <Q3PopupMenu>
--- a/qucs/node.h
+++ b/qucs/node.h
@ -20,7 +20,7 @@

 #include "element.h"

-#include <q3ptrlist.h>
+#include <Q3PtrList>

 class ViewPainter;
 class WireLabel;
--- a/qucs/octave_window.cpp
+++ b/qucs/octave_window.cpp
@ -7,13 +7,13 @@
 #include "main.h"

 #include <QSize>
-#include <q3vbox.h>
+#include <Q3VBox>
 #include <QColor>
-#include <q3accel.h>
+#include <Q3Accel>
 #include <QLayout>
 #include <QLineEdit>
-#include <q3textedit.h>
-#include <q3dockwindow.h>
+#include <Q3TextEdit>
+#include <Q3DockWindow>
 //Added by qt3to4:
 #include <Q3VBoxLayout>
 #include <QKeyEvent>
--- a/qucs/paintings/graphictext.cpp
+++ b/qucs/paintings/graphictext.cpp
@ -25,7 +25,7 @@
 #include <QWidget>
 #include <QPainter>
 #include <QLineEdit>
-#include <q3textedit.h>
+#include <Q3TextEdit>
 #include <QPushButton>

 #include <math.h>
--- a/qucs/paintings/id_dialog.cpp
+++ b/qucs/paintings/id_dialog.cpp
@ -18,14 +18,14 @@
 #include "id_dialog.h"
 #include "id_text.h"

-#include <q3hbox.h>
-#include <q3vbox.h>
+#include <Q3HBox>
+#include <Q3VBox>
 #include <QLabel>
 #include <QLayout>
-#include <q3listview.h>
+#include <Q3ListView>
 #include <QCheckBox>
 #include <QLineEdit>
-#include <q3vgroupbox.h>
+#include <Q3VGroupBox>
 #include <QValidator>
 #include <QPushButton>
 #include <QMessageBox>
--- a/qucs/paintings/id_text.h
+++ b/qucs/paintings/id_text.h
@ -21,7 +21,7 @@
 #include "painting.h"

 #include <QString>
-#include <q3ptrlist.h>
+#include <Q3PtrList>

 struct SubParameter {
  SubParameter(bool display_, const QString& Name_, const QString& Descr_)
--- a/qucs/qucs.cpp
+++ b/qucs/qucs.cpp
@ -26,7 +26,7 @@


 #include <QProcess>
-#include <q3syntaxhighlighter.h>
+#include <Q3SyntaxHighlighter>
 //Added by qt3to4:
 #include <Q3PtrList>
 #include <Q3TextEdit>
--- a/qucs/qucs.h
+++ b/qucs/qucs.h
@ -19,7 +19,7 @@
 #define QUCS_H

 #include <QtGui>
-//#include <q3mainwindow.h>
+//#include <Q3MainWindow>
 #include <QMainWindow>
 #include <QString>
 #include <QDir>
--- a/qucs/schematic.cpp
+++ b/qucs/schematic.cpp
@ -29,10 +29,10 @@
 #include <QPrinter>
 #include <QLineEdit>
 #include <QFileInfo>
-#include <q3iconview.h>
+#include <Q3IconView>
 #include <QTabWidget>
-#include <q3dragobject.h>
-#include <q3paintdevicemetrics.h>
+#include <Q3DragObject>
+#include <Q3PaintDeviceMetrics>
 #include <QDir>

 #include "qucs.h"
--- a/qucs/schematic.h
+++ b/qucs/schematic.h
@ -34,9 +34,9 @@
 #include "viewpainter.h"
 #include "node.h"

-#include <q3scrollview.h>
+#include <Q3ScrollView>
 #include <QPainter>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 #include <QFile>
 #include <QStringList>

--- a/qucs/schematic_file.cpp
+++ b/qucs/schematic_file.cpp
@ -23,9 +23,9 @@
 #include <QDir>
 #include <QStringList>
 #include <QRegExp>
-#include <q3textedit.h>
+#include <Q3TextEdit>
 #include <QTextEdit>
-#include <q3ptrlist.h>
+#include <Q3PtrList>
 //Added by qt3to4:
 #include <Q3TextStream>
 #include <Q3ValueList>
--- a/qucs/textdoc.h
+++ b/qucs/textdoc.h
@ -20,7 +20,7 @@


 #include <QTextEdit>
-#include <q3textedit.h>
+#include <Q3TextEdit>
 #include <QFont>

 #include "qucsdoc.h"
--- a/qucs/wire.h
+++ b/qucs/wire.h
@ -25,7 +25,7 @@

 #include <QPainter>
 #include <QString>
-#include <q3ptrlist.h>
+#include <Q3PtrList>


 class Wire : public Conductor {
--- a/qucs/wirelabel.h
+++ b/qucs/wirelabel.h
@ -23,7 +23,7 @@

 #include <QPainter>
 #include <QString>
-#include <q3ptrlist.h>
+#include <Q3PtrList>

 class Wire;
 class Node;