Skip to content

Commit 188137c

Browse files
guitorriguitorri
committed
Fix depreprecated header include
Silence the anoying warning: c:/Qt/4.8.5/include/Qt/qbrush.h:3:10: warning: #warning "Inclusion of header fil es from include/Qt is deprecated."
1 parent 55b61d0 commit 188137c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+282
-282
lines changed

‎qucs-attenuator/attenuatorfunc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "attenuatorfunc.h"
1717

18-
#include <qstring.h>
18+
#include <QString>
1919

2020
QUCS_Att::QUCS_Att(){}
2121
QUCS_Att::~QUCS_Att(){}

‎qucs-filter-v2/qf_box.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
#include "qf_dialog.h"
99

1010
#include <q3button.h>
11-
#include <qcombobox.h>
12-
#include <qlineedit.h>
13-
#include <qcheckbox.h>
14-
#include <qlabel.h>
15-
#include <qvalidator.h>
16-
#include <qpushbutton.h>
11+
#include <QComboBox>
12+
#include <QLineEdit>
13+
#include <QCheckBox>
14+
#include <QLabel>
15+
#include <QValidator>
16+
#include <QPushButton>
1717
#include <q3buttongroup.h>
1818
#include <qradiobutton.h>
1919

‎qucs-filter-v2/qf_box.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// API for the dialog box
22
// We need those Qt headers in order to compile properly
3-
#include <qobject.h>
4-
#include <qapplication.h>
3+
#include <QObject>
4+
#include <QApplication>
55
#include "qf_common.h"
66
#include "qf_dialog.h"
77

‎qucs-filter-v2/qf_comp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <vector>
55
#include <list>
66
#include <q3textstream.h>
7-
#include <qstring.h>
7+
#include <QString>
88

99
using namespace std;
1010

‎qucs-filter-v2/qf_dialog.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
#endif
2121

2222
#include <q3popupmenu.h>
23-
#include <qmenubar.h>
24-
#include <qlayout.h>
25-
#include <qtabwidget.h>
26-
#include <qlineedit.h>
27-
#include <qcombobox.h>
28-
#include <qlabel.h>
29-
#include <qcheckbox.h>
23+
#include <QMenuBar>
24+
#include <QLayout>
25+
#include <QTabWidget>
26+
#include <QLineEdit>
27+
#include <QComboBox>
28+
#include <QLabel>
29+
#include <QCheckBox>
3030
#include <qradiobutton.h>
3131
#include <q3buttongroup.h>
32-
#include <qpushbutton.h>
32+
#include <QPushButton>
3333
#include <q3hbox.h>
34-
#include <qmessagebox.h>
34+
#include <QMessageBox>
3535

3636
#include "qf_dialog.h"
3737
//Added by qt3to4:
@@ -110,7 +110,7 @@ FilterDialog::FilterDialog (QWidget * parent) : QDialog (parent)
110110
gp1->addWidget(AngleLabel,3,3);
111111
EnterAngle = new QLineEdit(Tab1);
112112
gp1->addWidget(EnterAngle,3,4);
113-
AngleUnitLabel = new QLabel(tr("°"),Tab1);
113+
AngleUnitLabel = new QLabel(tr("°"),Tab1);
114114
gp1->addWidget(AngleUnitLabel,3,5);
115115

116116
ZinLabel = new QLabel(tr("Zin"),Tab1);

‎qucs-filter-v2/qf_dialog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#ifndef FILTERDIALOG_H
1919
#define FILTERDIALOG_H
2020

21-
#include <qdialog.h>
21+
#include <QDialog>
2222
//Added by qt3to4:
2323
#include <Q3VBoxLayout>
2424
#include <QLabel>

‎qucs-filter-v2/qf_main.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
# include <config.h>
33
#endif
44

5-
#include <qbuffer.h>
5+
#include <QBuffer>
66
#include <q3textstream.h>
7-
#include <qobject.h>
8-
#include <qapplication.h>
7+
#include <QObject>
8+
#include <QApplication>
99
#include <q3textedit.h>
10-
#include <qdir.h>
11-
#include <qtextcodec.h>
12-
#include <qclipboard.h>
13-
#include <qlineedit.h>
14-
#include <qcombobox.h>
15-
#include <qcheckbox.h>
10+
#include <QDir>
11+
#include <QTextCodec>
12+
#include <QClipboard>
13+
#include <QLineEdit>
14+
#include <QComboBox>
15+
#include <QCheckBox>
1616

1717
#include "qf_common.h"
1818
#include "qf_poly.h"

‎qucs-filter-v2/qf_settings.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
# include <config.h>
1212
#endif
1313

14-
#include <qfile.h>
15-
#include <qdir.h>
16-
#include <qmessagebox.h>
17-
#include <qcheckbox.h>
18-
#include <qcombobox.h>
19-
#include <qlineedit.h>
20-
#include <qdom.h>
14+
#include <QFile>
15+
#include <QDir>
16+
#include <QMessageBox>
17+
#include <QCheckBox>
18+
#include <QComboBox>
19+
#include <QLineEdit>
20+
#include <QDom>
2121

2222
#include "qf_box.h"
2323
#include "qf_settings.h"

‎qucs-filter/lc_filter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <stdlib.h>
2626
#include <math.h>
2727

28-
#include <qstring.h>
28+
#include <QString>
2929

3030
#ifndef M_PI
3131
#define M_PI 3.14159265358979323846

‎qucs-help/htmldatafetcher.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
***************************************************************************/
1919

2020
#include "htmldatafetcher.h"
21-
#include <qmime.h>
21+
#include <QMimeData>
2222
#include <q3dragobject.h>
2323
//Added by qt3to4:
2424
#include <Q3TextStream>

‎qucs-help/htmldatafetcher.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
#ifndef __HDF_H
2121
#define __HDF_H
22-
#include <qstringlist.h>
23-
#include <qmap.h>
24-
#include <qfile.h>
22+
#include <QStringList>
23+
#include <QMap>
24+
#include <QFile>
2525

2626
class HtmlDataFetcher
2727
{

‎qucs-help/main.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121

2222
#include <stdlib.h>
2323

24-
#include <qapplication.h>
25-
#include <qstring.h>
26-
#include <qtextcodec.h>
27-
#include <qtranslator.h>
28-
#include <qfile.h>
24+
#include <QApplication>
25+
#include <QString>
26+
#include <QTextCodec>
27+
#include <QTranslator>
28+
#include <QFile>
2929
#include <q3textstream.h>
30-
#include <qmessagebox.h>
31-
#include <qdir.h>
32-
#include <qfont.h>
33-
#include <qtextcodec.h>
30+
#include <QMessageBox>
31+
#include <QDir>
32+
#include <QFont>
33+
#include <QTextCodec>
3434

3535
#include "qucshelp.h"
3636

‎qucs-help/qucshelp.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
#include "qucshelp.h"
2323
#include "htmldatafetcher.h"
2424

25-
#include <qpushbutton.h>
26-
#include <qaction.h>
27-
#include <qpixmap.h>
28-
#include <qfile.h>
25+
#include <QPushButton>
26+
#include <QAction>
27+
#include <QPixmap>
28+
#include <QFile>
2929
#include <q3textstream.h>
3030
#include <q3popupmenu.h>
31-
#include <qmenubar.h>
32-
#include <qapplication.h>
31+
#include <QMenuBar>
32+
#include <QApplication>
3333
#include <q3listview.h>
3434

3535

‎qucs-help/qucshelp.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
#include <q3mainwindow.h>
2222
#include <q3textbrowser.h>
23-
#include <qdir.h>
24-
#include <qfont.h>
25-
#include <qstringlist.h>
23+
#include <QDir>
24+
#include <QFont>
25+
#include <QStringList>
2626

2727
struct tQucsSettings {
2828
int x, y, dx, dy; // position and size of main window

‎qucs-lib/displaydialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "displaydialog.h"
2323

24-
//#include <qlayout.h>
24+
//#include <QLayout>
2525
#include <QPushButton>
2626
#include <QTextEdit>
2727
#include <QGroupBox>

‎qucs-lib/main.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121

2222
#include <stdlib.h>
2323

24-
#include <qapplication.h>
25-
#include <qstring.h>
26-
#include <qtextcodec.h>
27-
#include <qtranslator.h>
28-
#include <qfile.h>
24+
#include <QApplication>
25+
#include <QString>
26+
#include <QTextCodec>
27+
#include <QTranslator>
28+
#include <QFile>
2929
#include <QTextStream>
30-
#include <qmessagebox.h>
31-
#include <qdir.h>
32-
#include <qfont.h>
30+
#include <QMessageBox>
31+
#include <QDir>
32+
#include <QFont>
3333
#include <QSettings>
3434
#include "qucslib.h"
3535

‎qucs-lib/symbolwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <math.h>
1919
#include <limits.h>
2020

21-
#include <qpainter.h>
21+
#include <QPainter>
2222
//#include <q3dragobject.h>
2323
//Added by qt3to4:
2424
#include <QPaintEvent>

‎qucs/components/component.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
#include <QtGui>
1818
#include <stdlib.h>
1919

20-
#include <qdir.h>
21-
#include <qpen.h>
22-
#include <qpoint.h>
23-
#include <qstring.h>
24-
#include <qpainter.h>
25-
#include <qtabwidget.h>
26-
#include <qmessagebox.h>
27-
#include <qdom.h>
20+
#include <QDir>
21+
#include <QPen>
22+
#include <QPoint>
23+
#include <QString>
24+
#include <QPainter>
25+
#include <QTabWidget>
26+
#include <QMessageBox>
27+
#include <QDom>
2828
#include <q3dict.h>
2929

3030
#include "components.h"

‎qucs/components/component.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#define COMPONENT_H
2020

2121
#include <q3ptrlist.h>
22-
#include <qpen.h>
23-
#include <qpoint.h>
24-
#include <qwidget.h>
22+
#include <QPen>
23+
#include <QPoint>
24+
#include <QWidget>
2525

2626
#include "element.h"
2727

‎qucs/components/componentdialog.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
#include <q3hbox.h>
2929
#include <q3vbox.h>
30-
#include <qlayout.h>
30+
#include <QLayout>
3131
#include <q3hgroupbox.h>
32-
#include <qvalidator.h>
33-
#include <qtabwidget.h>
32+
#include <QValidator>
33+
#include <QTabWidget>
3434
#include <q3filedialog.h>
3535

3636
#include <math.h>

‎qucs/components/componentdialog.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
#define COMPONENTDIALOG_H
2020
#include <QtGui>
2121
#include "component.h"
22-
#include <qlabel.h>
23-
#include <qdialog.h>
22+
#include <QLabel>
23+
#include <QDialog>
2424
#include <q3listview.h>
25-
#include <qlineedit.h>
26-
#include <qcheckbox.h>
27-
#include <qregexp.h>
28-
#include <qcombobox.h>
29-
#include <qpushbutton.h>
25+
#include <QLineEdit>
26+
#include <QCheckBox>
27+
#include <QRegExp>
28+
#include <QComboBox>
29+
#include <QPushButton>
3030
#include <q3ptrlist.h>
31-
#include <qdir.h>
31+
#include <QDir>
3232
//Added by qt3to4:
3333
#include <Q3GridLayout>
3434
#include <Q3VBoxLayout>

‎qucs/components/eqndefined.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "main.h"
2020
#include "schematic.h"
2121

22-
#include <qfileinfo.h>
22+
#include <QFileInfo>
2323

2424

2525
EqnDefined::EqnDefined()

‎qucs/components/libcomp.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#include "main.h"
2727
#include "schematic.h"
2828

29-
#include <qdir.h>
30-
#include <qfileinfo.h>
31-
#include <qregexp.h>
29+
#include <QDir>
30+
#include <QFileInfo>
31+
#include <QRegExp>
3232

3333
#include <math.h>
3434
#include <limits.h>

‎qucs/components/opt_sim.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
* *
1616
***************************************************************************/
1717
#include <QtGui>
18-
#include <qdir.h>
19-
#include <qfile.h>
18+
#include <QDir>
19+
#include <QFile>
2020
#include <q3textstream.h>
21-
#include <qregexp.h>
22-
#include <qstring.h>
23-
#include <qstringlist.h>
21+
#include <QRegExp>
22+
#include <QString>
23+
#include <QStringList>
2424

2525
#include "opt_sim.h"
2626
#include "main.h"

0 commit comments

Comments
 (0)