From 3ba8946b051231bb702738d08bd451ac4c7f0823 Mon Sep 17 00:00:00 2001 From: Peinthor Rene Date: Sat, 21 Jan 2012 20:14:30 +0100 Subject: [PATCH] get rid of more q3support stuff --- src/mainwindow.cpp | 8 ++++---- src/mainwindow.h | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 68179c10..dedf3acf 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "qmessagebox.h" //#include "q3filedialog.h" @@ -786,7 +786,7 @@ void mainForm::paste() void mainForm::helpWhatsThis() { - Q3WhatsThis::enterWhatsThisMode (); + QWhatsThis::enterWhatsThisMode (); } @@ -1016,7 +1016,7 @@ void mainForm::exportTableToCSV() char feed = 10; int colNum = 0; int colCount = 0; - Q3TextStream stream( &file ); + QTextStream stream( &file ); //fieldnames on first row QStringList fields = db.browseFields; colCount = fields.count(); diff --git a/src/mainwindow.h b/src/mainwindow.h index 91248e55..5a40163d 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -12,7 +12,6 @@ #define QT_END_NAMESPACE #endif -#include #include #include #include @@ -20,9 +19,8 @@ #include #include -#include #include -#include +#include #include #include @@ -120,7 +118,7 @@ public: QWidget *query; QVBoxLayout *vboxLayout3; QLabel *textLabel1_2; - Q3TextEdit *sqlTextEdit; + QTextEdit *sqlTextEdit; QHBoxLayout *hboxLayout2; QPushButton *executeQueryButton; QSpacerItem *spacer4_2; @@ -484,7 +482,7 @@ public: vboxLayout3->addWidget(textLabel1_2); - sqlTextEdit = new Q3TextEdit(query); + sqlTextEdit = new QTextEdit(query); sqlTextEdit->setObjectName(QString::fromUtf8("sqlTextEdit")); QSizePolicy sizePolicy1(static_cast(7), static_cast(5)); sizePolicy1.setHorizontalStretch(0); @@ -518,6 +516,7 @@ public: queryErrorLineEdit = new QLineEdit(query); queryErrorLineEdit->setObjectName(QString::fromUtf8("queryErrorLineEdit")); queryErrorLineEdit->setReadOnly(true); + queryErrorLineEdit->setDisabled(true); vboxLayout3->addWidget(queryErrorLineEdit);