From 121a986be20c0d18acb73d6f296e0a31e62828d0 Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Mon, 21 Apr 2014 01:33:19 +0800 Subject: wip: Migrate to Qt5 -- API,name changes toAscii -> toLatin1 WFlags -> WindowFlags QCustomEvent -> QEvent QItemDelegate::check -> QItemDelegate::toCheck TRUE,FALSE -> true,false --- src/common/fqterm_filedialog.cpp | 2 +- src/common/fqterm_filedialog.h | 2 +- src/common/fqterm_trace.h | 2 +- src/fqterm/fqterm_frame.cpp | 4 ++-- src/fqterm/fqterm_python.cpp | 4 ++-- src/fqterm/fqterm_screen.cpp | 6 +++--- src/fqterm/fqterm_window.cpp | 8 ++++---- src/fqterm/fqterm_window.h | 2 +- src/protocol/fqterm_ssh_socket.cpp | 4 ++-- src/protocol/internal/fqterm_ssh2_kex.cpp | 2 +- src/ui/aboutdialog.cpp | 2 +- src/ui/aboutdialog.h | 2 +- src/ui/addrdialog.cpp | 8 ++++---- src/ui/addrdialog.h | 3 ++- src/ui/articledialog.cpp | 2 +- src/ui/articledialog.h | 2 +- src/ui/defineescape.cpp | 2 +- src/ui/defineescape.h | 2 +- src/ui/fqterm_canvas.cpp | 2 +- src/ui/fqterm_canvas.h | 2 +- src/ui/fqterm_time_label.cpp | 2 +- src/ui/fqterm_time_label.h | 2 +- src/ui/imageviewer.cpp | 4 ++-- src/ui/iplookup.cpp | 10 ++++++---- src/ui/iplookup.h | 2 +- src/ui/keydialog.cpp | 2 +- src/ui/keydialog.h | 2 +- src/ui/msgdialog.cpp | 2 +- src/ui/msgdialog.h | 2 +- src/ui/popupMessage.cpp | 4 ++-- src/ui/popwidget.cpp | 2 +- src/ui/popwidget.h | 4 ++-- src/ui/prefdialog.cpp | 2 +- src/ui/prefdialog.h | 2 +- src/ui/quickdialog.cpp | 2 +- src/ui/quickdialog.h | 2 +- src/ui/schemadialog.cpp | 2 +- src/ui/schemadialog.h | 2 +- src/ui/shortcutdialog.cpp | 2 +- src/ui/shortcutdialog.h | 2 +- src/ui/sitemanager.cpp | 2 +- src/ui/sitemanager.h | 2 +- src/ui/soundconf.cpp | 2 +- src/ui/soundconf.h | 2 +- src/ui/sshlogindialog.cpp | 2 +- src/ui/sshlogindialog.h | 2 +- src/ui/statusBar.cpp | 8 ++++---- src/ui/zmodemdialog.cpp | 2 +- src/ui/zmodemdialog.h | 2 +- src/utilities/fqterm_ip_location.cpp | 6 +++--- 50 files changed, 75 insertions(+), 72 deletions(-) (limited to 'src') diff --git a/src/common/fqterm_filedialog.cpp b/src/common/fqterm_filedialog.cpp index 31829ac..a5c97ac 100644 --- a/src/common/fqterm_filedialog.cpp +++ b/src/common/fqterm_filedialog.cpp @@ -33,7 +33,7 @@ namespace FQTerm { -FQTermFileDialog::FQTermFileDialog(FQTermConfig *config, QWidget *parent, Qt::WFlags fl) +FQTermFileDialog::FQTermFileDialog(FQTermConfig *config, QWidget *parent, Qt::WindowFlags fl) : QFileDialog(parent, fl) { configDir = getPath(USER_CONFIG) + "/"; diff --git a/src/common/fqterm_filedialog.h b/src/common/fqterm_filedialog.h index 5248ffd..de97e17 100644 --- a/src/common/fqterm_filedialog.h +++ b/src/common/fqterm_filedialog.h @@ -30,7 +30,7 @@ class FQTermConfig; class FQTermFileDialog: public QFileDialog { public: - FQTermFileDialog(FQTermConfig *config, QWidget *parent_ = 0, Qt::WFlags fl = 0); + FQTermFileDialog(FQTermConfig *config, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~FQTermFileDialog(); QString getSaveName(const QString &filename, const QString &hints, QWidget *widget = 0); diff --git a/src/common/fqterm_trace.h b/src/common/fqterm_trace.h index 8b7423e..627cbca 100644 --- a/src/common/fqterm_trace.h +++ b/src/common/fqterm_trace.h @@ -94,7 +94,7 @@ class FQTermTrace { (*this) << "[" << category_ << " " << trace_level << " "; #ifndef NO_FQTERM_TRACE_FILE_LINE_NUM - (*this) << QFileInfo(file_name).fileName().toAscii().constData() + (*this) << QFileInfo(file_name).fileName().toLatin1().constData() << ": " << line_num; #endif // NO_FQTERM_TRACE_FILE_LINE_NUM diff --git a/src/fqterm/fqterm_frame.cpp b/src/fqterm/fqterm_frame.cpp index e5c863e..916ecb6 100644 --- a/src/fqterm/fqterm_frame.cpp +++ b/src/fqterm/fqterm_frame.cpp @@ -1306,7 +1306,7 @@ void FQTermFrame::keyClicked(int id) { windowManager_->activeWindow()->runPythonScriptFile(scriptFile); else #endif - windowManager_->activeWindow()->runScript(scriptFile.toAscii()); + windowManager_->activeWindow()->runScript(scriptFile.toLatin1()); } else if (strTmp[0] == '2') { // program runProgram(strTmp.mid(1)); } @@ -2045,7 +2045,7 @@ void FQTermFrame::loadToolBarPosition() QString strTmp = config_->getItemValue("global", "toolbarstate"); if (!strTmp.isEmpty()) { - restoreState(QByteArray::fromHex(strTmp.toAscii())); + restoreState(QByteArray::fromHex(strTmp.toLatin1())); } else { addToolBar(Qt::TopToolBarArea, toolBarMdiConnectTools_); insertToolBar(toolBarMdiConnectTools_,toolBarSetupKeys_); diff --git a/src/fqterm/fqterm_python.cpp b/src/fqterm/fqterm_python.cpp index 68b9385..b4d710e 100644 --- a/src/fqterm/fqterm_python.cpp +++ b/src/fqterm/fqterm_python.cpp @@ -20,7 +20,7 @@ -#include +#include #include #include #include @@ -823,4 +823,4 @@ FQTermPythonHelper::~FQTermPythonHelper() { } // namespace FQTerm -#endif //HAVE_PYTHON \ No newline at end of file +#endif //HAVE_PYTHON diff --git a/src/fqterm/fqterm_screen.cpp b/src/fqterm/fqterm_screen.cpp index 339e666..de51381 100644 --- a/src/fqterm/fqterm_screen.cpp +++ b/src/fqterm/fqterm_screen.cpp @@ -912,7 +912,7 @@ void FQTermScreen::repaintScreen(QPaintEvent *pe, QPainter &painter) { FQ_TRACE("screen", 5) << "Client area: " << pe->rect().width() << "x" << pe->rect().height(); - QRect rect = pe->rect().intersect(clientRectangle_); + QRect rect = pe->rect().intersected(clientRectangle_); //painter.eraseRect(rect); drawBackground(painter, rect, 0); QPoint tlPoint = mapToChar(QPoint(rect.left(), rect.top())); @@ -1446,7 +1446,7 @@ QImage &FQTermScreen::fade(QImage &img, float val, const QColor &color) { if (img.depth() <= 8) { // pseudo color - for (int i = 0; i < img.numColors(); i++) { + for (int i = 0; i < img.colorCount(); i++) { col = img.color(i); cr = qRed(col); cg = qGreen(col); @@ -1646,7 +1646,7 @@ void FQTermScreen::updateWidgetRect(QPainter& painter) { - QRect rect = widgetRect_.intersect(clientRectangle_); + QRect rect = widgetRect_.intersected(clientRectangle_); if (rect.isEmpty()) return; drawBackground(painter, rect, 0); diff --git a/src/fqterm/fqterm_window.cpp b/src/fqterm/fqterm_window.cpp index 59d5a48..f253a98 100644 --- a/src/fqterm/fqterm_window.cpp +++ b/src/fqterm/fqterm_window.cpp @@ -91,7 +91,7 @@ char FQTermWindow::directions_[][5] = { "\x1b[D", // 6 LEFT "\x1b[C" // 7 RIGHT }; - +/* class FAQ: public QObject { Q_OBJECT; public slots: @@ -102,12 +102,12 @@ class FAQ: public QObject { private: int a; }; - +*/ //constructor FQTermWindow::FQTermWindow(FQTermConfig *config, FQTermFrame *frame, FQTermParam param, int addressIndex, QWidget *parent, - const char *name, Qt::WFlags wflags) + const char *name, Qt::WindowFlags wflags) : QMainWindow(parent, wflags), frame_(frame), isSelecting_(false), @@ -1800,7 +1800,7 @@ void FQTermWindow::startBlink() { void FQTermWindow::stopBlink() { if (tabBlinkTimer_->isActive()) { tabBlinkTimer_->stop(); - emit blinkTheTab(this, TRUE); + emit blinkTheTab(this, true); } } diff --git a/src/fqterm/fqterm_window.h b/src/fqterm/fqterm_window.h index d01b9e9..7a736b3 100644 --- a/src/fqterm/fqterm_window.h +++ b/src/fqterm/fqterm_window.h @@ -88,7 +88,7 @@ class FQTermWindow : public QMainWindow, Q_OBJECT; public: FQTermWindow(FQTermConfig *, FQTermFrame *frame, FQTermParam param, int addr = -1, QWidget - *parent = 0, const char *name = 0, Qt::WFlags wflags = Qt::Window); + *parent = 0, const char *name = 0, Qt::WindowFlags wflags = Qt::Window); ~FQTermWindow(); void connectHost(); diff --git a/src/protocol/fqterm_ssh_socket.cpp b/src/protocol/fqterm_ssh_socket.cpp index 4c1e77a..8c24f88 100644 --- a/src/protocol/fqterm_ssh_socket.cpp +++ b/src/protocol/fqterm_ssh_socket.cpp @@ -104,7 +104,7 @@ void FQTermSSHSocket::init(int ssh_version) { socket_buffer_ = new FQTermSSHBuffer(1024); packet_receiver_ = new FQTermSSH1PacketReceiver; packet_sender_ = new FQTermSSH1PacketSender; - key_exchanger_ = new FQTermSSH1Kex(SSH_V1_C, server_name_.toAscii().constData()); + key_exchanger_ = new FQTermSSH1Kex(SSH_V1_C, server_name_.toLatin1().constData()); authentication_ = new FQTermSSH1PasswdAuth(init_user_, init_passwd_); ssh_channel_ = new FQTermSSH1Channel; @@ -134,7 +134,7 @@ void FQTermSSHSocket::init(int ssh_version) { socket_buffer_ = new FQTermSSHBuffer(1024); packet_receiver_ = new FQTermSSH2PacketReceiver; packet_sender_ = new FQTermSSH2PacketSender; - key_exchanger_ = new FQTermSSH2Kex(SSH_V2_C, server_name_.toAscii().constData()); + key_exchanger_ = new FQTermSSH2Kex(SSH_V2_C, server_name_.toLatin1().constData()); authentication_ = new FQTermSSH2PasswdAuth(init_user_, init_passwd_); ssh_channel_ = new FQTermSSH2Channel; diff --git a/src/protocol/internal/fqterm_ssh2_kex.cpp b/src/protocol/internal/fqterm_ssh2_kex.cpp index acae08d..53026e9 100644 --- a/src/protocol/internal/fqterm_ssh2_kex.cpp +++ b/src/protocol/internal/fqterm_ssh2_kex.cpp @@ -156,7 +156,7 @@ void FQTermSSH2Kex::negotiateAlgorithms() { if (name_lists_len > 0) { name_lists.resize(name_lists_len); packet_receiver_->getRawData(&name_lists[0], name_lists_len); - FQ_TRACE("ssh2kex", 5) << "Algorithms: " << QString::fromAscii(&name_lists[0], name_lists_len); + FQ_TRACE("ssh2kex", 5) << "Algorithms: " << QString::fromLatin1(&name_lists[0], name_lists_len); } else { FQ_TRACE("ssh2kex", 5) << "None Algorithms"; } diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp index 130810b..bd2635f 100644 --- a/src/ui/aboutdialog.cpp +++ b/src/ui/aboutdialog.cpp @@ -37,7 +37,7 @@ namespace FQTerm { * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -aboutDialog::aboutDialog(QWidget *parent, Qt::WFlags fl) +aboutDialog::aboutDialog(QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl) { ui_.setupUi(this); diff --git a/src/ui/aboutdialog.h b/src/ui/aboutdialog.h index cf40c4b..ebc13bb 100644 --- a/src/ui/aboutdialog.h +++ b/src/ui/aboutdialog.h @@ -28,7 +28,7 @@ namespace FQTerm { class aboutDialog: public QDialog { Q_OBJECT; public: - aboutDialog(QWidget *parent = 0, Qt::WFlags fl = 0); + aboutDialog(QWidget *parent = 0, Qt::WindowFlags fl = 0); ~aboutDialog(); private: Ui::aboutDialog ui_; diff --git a/src/ui/addrdialog.cpp b/src/ui/addrdialog.cpp index ab4f174..5c6d2f3 100644 --- a/src/ui/addrdialog.cpp +++ b/src/ui/addrdialog.cpp @@ -46,7 +46,7 @@ const int addrDialog::ports[3] = {23, 22, 22}; * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -addrDialog::addrDialog(QWidget *parent_, const FQTermParam& parameter, int buttons, Qt::WFlags fl) +addrDialog::addrDialog(QWidget *parent_, const FQTermParam& parameter, int buttons, Qt::WindowFlags fl) : QDialog(parent_, fl), menuButtonGroup_(this), param_(parameter) { @@ -242,7 +242,7 @@ void addrDialog::onCancel() { void addrDialog::onFgcolor() { QColor color = QColorDialog::getColor(param_.foregroundColor_); - if (color.isValid() == TRUE) { + if (color.isValid() == true) { param_.foregroundColor_ = color; previewFont(); } @@ -250,7 +250,7 @@ void addrDialog::onFgcolor() { void addrDialog::onBgcolor() { QColor color = QColorDialog::getColor(param_.backgroundColor_); - if (color.isValid() == TRUE) { + if (color.isValid() == true) { param_.backgroundColor_ = color; previewFont(); } @@ -300,7 +300,7 @@ void addrDialog::onChooseScript() { void addrDialog::onMenuColor() { QColor color = QColorDialog::getColor(param_.menuColor_); - if (color.isValid() == TRUE) { + if (color.isValid() == true) { param_.menuColor_ = color; previewMenu(); } diff --git a/src/ui/addrdialog.h b/src/ui/addrdialog.h index 8405a0a..5cc7e76 100644 --- a/src/ui/addrdialog.h +++ b/src/ui/addrdialog.h @@ -34,7 +34,8 @@ class addrDialog: public QDialog { Q_OBJECT; public: enum BUTTONS{SAVE = 0x01, APPLY = 0x02}; - addrDialog(QWidget *parent_ = 0, const FQTermParam& param = FQTermParam(), int buttons = SAVE | APPLY, Qt::WFlags fl = 0); + addrDialog(QWidget *parent_ = 0, const FQTermParam& param = FQTermParam(), + int buttons = SAVE | APPLY, Qt::WindowFlags fl = 0); ~addrDialog(); void setParam(const FQTermParam& param) { param_ = param; diff --git a/src/ui/articledialog.cpp b/src/ui/articledialog.cpp index 43ba617..42df905 100644 --- a/src/ui/articledialog.cpp +++ b/src/ui/articledialog.cpp @@ -36,7 +36,7 @@ namespace FQTerm { -articleDialog::articleDialog(FQTermConfig *config, QWidget *parent, Qt::WFlags fl) +articleDialog::articleDialog(FQTermConfig *config, QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl) { ui_.setupUi(this); connectSlots(); diff --git a/src/ui/articledialog.h b/src/ui/articledialog.h index 0e40cbf..755b906 100644 --- a/src/ui/articledialog.h +++ b/src/ui/articledialog.h @@ -31,7 +31,7 @@ class FQTermFileDialog; class articleDialog: public QDialog { Q_OBJECT; public: - articleDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WFlags fl = 0); + articleDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~articleDialog(); QString articleText_; diff --git a/src/ui/defineescape.cpp b/src/ui/defineescape.cpp index fea042d..2421018 100644 --- a/src/ui/defineescape.cpp +++ b/src/ui/defineescape.cpp @@ -27,7 +27,7 @@ DefineEscapeDialog::~DefineEscapeDialog() { } -DefineEscapeDialog::DefineEscapeDialog(QString& strEsc, QWidget *parent_ /*= 0*/, Qt::WFlags fl /*= 0*/) +DefineEscapeDialog::DefineEscapeDialog(QString& strEsc, QWidget *parent_ /*= 0*/, Qt::WindowFlags fl /*= 0*/) : QDialog(parent_, fl), strEsc_(strEsc) { ui_.setupUi(this); diff --git a/src/ui/defineescape.h b/src/ui/defineescape.h index 78b97d2..88367d9 100644 --- a/src/ui/defineescape.h +++ b/src/ui/defineescape.h @@ -28,7 +28,7 @@ namespace FQTerm { class DefineEscapeDialog : public QDialog { Q_OBJECT; public: - DefineEscapeDialog(QString& strEsc, QWidget *parent_ = 0, Qt::WFlags fl = 0); + DefineEscapeDialog(QString& strEsc, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~DefineEscapeDialog(); void setTitleAndText(const QString &title, const QString &text); void setEditText(const QString &text); diff --git a/src/ui/fqterm_canvas.cpp b/src/ui/fqterm_canvas.cpp index f17ee58..82fc971 100644 --- a/src/ui/fqterm_canvas.cpp +++ b/src/ui/fqterm_canvas.cpp @@ -45,7 +45,7 @@ namespace FQTerm { -FQTermCanvas::FQTermCanvas(FQTermConfig * config, QWidget *parent, Qt::WFlags f) +FQTermCanvas::FQTermCanvas(FQTermConfig * config, QWidget *parent, Qt::WindowFlags f) : QScrollArea(parent), adjustMode_(Fit), aspectRatioMode_(Qt::KeepAspectRatio){ diff --git a/src/ui/fqterm_canvas.h b/src/ui/fqterm_canvas.h index be15879..5941700 100644 --- a/src/ui/fqterm_canvas.h +++ b/src/ui/fqterm_canvas.h @@ -44,7 +44,7 @@ class FQTermFileDialog; class FQTermCanvas: public QScrollArea { Q_OBJECT; public: - FQTermCanvas(FQTermConfig *, QWidget *parent_ = NULL, Qt::WFlags f = Qt::Window); + FQTermCanvas(FQTermConfig *, QWidget *parent_ = NULL, Qt::WindowFlags f = Qt::Window); ~FQTermCanvas(); enum AdjustMode{Origin, Fit, Stretch, MaxFit}; diff --git a/src/ui/fqterm_time_label.cpp b/src/ui/fqterm_time_label.cpp index 1d05b0e..c8e3ff3 100644 --- a/src/ui/fqterm_time_label.cpp +++ b/src/ui/fqterm_time_label.cpp @@ -27,7 +27,7 @@ namespace FQTerm { //constructor -FQTermTimeLabel::FQTermTimeLabel(QWidget *parent, const char *name, Qt::WFlags f) +FQTermTimeLabel::FQTermTimeLabel(QWidget *parent, const char *name, Qt::WindowFlags f) : QLabel(parent, f) { setAlignment(Qt::AlignHCenter); currentTime_ = new QTime(); diff --git a/src/ui/fqterm_time_label.h b/src/ui/fqterm_time_label.h index ac510b6..3e82a6e 100644 --- a/src/ui/fqterm_time_label.h +++ b/src/ui/fqterm_time_label.h @@ -31,7 +31,7 @@ namespace FQTerm { class FQTermTimeLabel: public QLabel { Q_OBJECT; public: - FQTermTimeLabel(QWidget *parent, const char *name = 0, Qt::WFlags f = 0); + FQTermTimeLabel(QWidget *parent, const char *name = 0, Qt::WindowFlags f = 0); ~FQTermTimeLabel(); protected: diff --git a/src/ui/imageviewer.cpp b/src/ui/imageviewer.cpp index 296c5a8..79677c9 100644 --- a/src/ui/imageviewer.cpp +++ b/src/ui/imageviewer.cpp @@ -1454,7 +1454,7 @@ namespace FQTerm { FQ_VERIFY(connect(tree_, SIGNAL(activated(const QModelIndex &)), this, SLOT(onChange(const QModelIndex &)))); FQ_VERIFY(connect(tree_->selectionModel(), - SIGNAL(selectionChanged(const QItemSelection&, + SIGNAL(selectionChanged(const QIetmSelection&, const QItemSelection&)), this, SLOT(selectionChanged(const QItemSelection&, const QItemSelection&)))); @@ -1711,7 +1711,7 @@ namespace FQTerm { if (value.isValid()) { checkState = static_cast(value.toInt()); - checkRect = check(opt, opt.rect, value); + checkRect = doCheck(opt, opt.rect, value); } // do the layout diff --git a/src/ui/iplookup.cpp b/src/ui/iplookup.cpp index e84c126..c3e8675 100644 --- a/src/ui/iplookup.cpp +++ b/src/ui/iplookup.cpp @@ -29,7 +29,7 @@ IPLookupDialog::~IPLookupDialog(){ } -IPLookupDialog::IPLookupDialog( QWidget *parent_ /*= 0*/, Qt::WFlags fl /*= 0*/ ) : QDialog(parent_, fl) { +IPLookupDialog::IPLookupDialog( QWidget *parent_ /*= 0*/, Qt::WindowFlags fl /*= 0*/ ) : QDialog(parent_, fl) { ui_.setupUi(this); FQ_VERIFY(connect(ui_.lookupPushButton, SIGNAL(clicked()), this, SLOT(onLookup()))); FQ_VERIFY(connect(ui_.finishedPushButton, SIGNAL(clicked()), this, SLOT(onFinished()))); @@ -40,9 +40,11 @@ void IPLookupDialog::onLookup() { QString ip = ui_.ipLineEdit->text(); FQTermIPLocation *ipLocation = FQTermIPLocation::getInstance(); if (ipLocation == NULL) { - ui_.addressLineEdit->setText(QApplication::translate("IPLookupDialog", "IP database file does NOT exist", 0, QApplication::UnicodeUTF8)); + ui_.addressLineEdit->setText( + QApplication::translate("IPLookupDialog", "IP database file does NOT exist", 0, 0)); } else if (!ipLocation->getLocation(ip, country, city)) { - ui_.addressLineEdit->setText(QApplication::translate("IPLookupDialog", "Invalid IP", 0, QApplication::UnicodeUTF8)); + ui_.addressLineEdit->setText( + QApplication::translate("IPLookupDialog", "Invalid IP", 0, 0)); } else { ui_.addressLineEdit->setText(country + " " + city); } @@ -53,4 +55,4 @@ void IPLookupDialog::onFinished() { } } //namespace FQTerm -#include "iplookup.moc" \ No newline at end of file +#include "iplookup.moc" diff --git a/src/ui/iplookup.h b/src/ui/iplookup.h index 4f38a5a..38dc94a 100644 --- a/src/ui/iplookup.h +++ b/src/ui/iplookup.h @@ -28,7 +28,7 @@ namespace FQTerm { class IPLookupDialog : public QDialog { Q_OBJECT; public: - IPLookupDialog(QWidget *parent_ = 0, Qt::WFlags fl = 0); + IPLookupDialog(QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~IPLookupDialog(); protected slots: diff --git a/src/ui/keydialog.cpp b/src/ui/keydialog.cpp index 2e3aadb..2f2ac65 100644 --- a/src/ui/keydialog.cpp +++ b/src/ui/keydialog.cpp @@ -35,7 +35,7 @@ namespace FQTerm { * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -keyDialog::keyDialog(FQTermConfig * config, QWidget *parent, Qt::WFlags fl) +keyDialog::keyDialog(FQTermConfig * config, QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl), keyButtonGroup_(this), config_(config) { diff --git a/src/ui/keydialog.h b/src/ui/keydialog.h index fa087c3..6ef303a 100644 --- a/src/ui/keydialog.h +++ b/src/ui/keydialog.h @@ -30,7 +30,7 @@ class FQTermConfig; class keyDialog: public QDialog { Q_OBJECT; public: - keyDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WFlags fl = 0); + keyDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~keyDialog(); protected: diff --git a/src/ui/msgdialog.cpp b/src/ui/msgdialog.cpp index 1db7495..de89ab7 100644 --- a/src/ui/msgdialog.cpp +++ b/src/ui/msgdialog.cpp @@ -22,7 +22,7 @@ #include "msgdialog.h" -msgDialog::msgDialog(QWidget *parent, Qt::WFlags fl) +msgDialog::msgDialog(QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl) { ui_.setupUi(this); // signals and slots connections diff --git a/src/ui/msgdialog.h b/src/ui/msgdialog.h index e3c5185..b33976e 100644 --- a/src/ui/msgdialog.h +++ b/src/ui/msgdialog.h @@ -26,7 +26,7 @@ class msgDialog: public QDialog { Q_OBJECT; public: - msgDialog(QWidget *parent = 0, Qt::WFlags fl = 0); + msgDialog(QWidget *parent = 0, Qt::WindowFlags fl = 0); ~msgDialog(); void setMessageText(const QString& message); Ui::msgDialog ui_; diff --git a/src/ui/popupMessage.cpp b/src/ui/popupMessage.cpp index 6b89b38..7723029 100644 --- a/src/ui/popupMessage.cpp +++ b/src/ui/popupMessage.cpp @@ -108,13 +108,13 @@ void PopupMessage::addWidget(QWidget *widget) { } void PopupMessage::showCloseButton(const bool show) { - findChild < QPushButton * > ("closeButton")->setShown(show); + findChild < QPushButton * > ("closeButton")->setVisible(show); adjustSize(); } void PopupMessage::showCounter(const bool show) { isCounterShown_ = show; - findChild < QFrame * > ("counterVisual")->setShown(show); + findChild < QFrame * > ("counterVisual")->setVisible(show); adjustSize(); } diff --git a/src/ui/popwidget.cpp b/src/ui/popwidget.cpp index 1c702ed..d8b5b87 100644 --- a/src/ui/popwidget.cpp +++ b/src/ui/popwidget.cpp @@ -34,7 +34,7 @@ namespace FQTerm { extern QString pathLib; popWidget::popWidget(FQTermWindow *win, QWidget *parent_, const char *name, - Qt::WFlags f) + Qt::WindowFlags f) : QWidget(parent_, f) { // QPixmap pxm(QPixmap(pathLib+"pic/popwidget.png") ); // if(!pxm.isNull()) diff --git a/src/ui/popwidget.h b/src/ui/popwidget.h index 2a02c7d..dc090f9 100644 --- a/src/ui/popwidget.h +++ b/src/ui/popwidget.h @@ -37,10 +37,10 @@ class popWidget: public QWidget { Q_OBJECT; public: // #if (QT_VERSION>=310) - // popWidget(FQTermWindow * win, QWidget *parent = 0, const char *name=0, WFlags f=WStyle_Splash); + // popWidget(FQTermWindow * win, QWidget *parent = 0, const char *name=0, WindowFlags f=WStyle_Splash); // #else popWidget(FQTermWindow *win, QWidget *parent_ = 0, const char *name = 0, - Qt::WFlags f = Qt::WindowStaysOnTopHint + Qt::WindowFlags f = Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint | Qt::Tool); // #endif diff --git a/src/ui/prefdialog.cpp b/src/ui/prefdialog.cpp index 9f01a08..0ddffdf 100644 --- a/src/ui/prefdialog.cpp +++ b/src/ui/prefdialog.cpp @@ -38,7 +38,7 @@ namespace FQTerm { * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -prefDialog::prefDialog(FQTermConfig * config, QWidget *parent, Qt::WFlags fl) +prefDialog::prefDialog(FQTermConfig * config, QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl), soundButtonGroup_(this), verticalSettingButtonGroup_(this), diff --git a/src/ui/prefdialog.h b/src/ui/prefdialog.h index 99e58c6..d4db71a 100644 --- a/src/ui/prefdialog.h +++ b/src/ui/prefdialog.h @@ -33,7 +33,7 @@ class FQTermConfig; class prefDialog: public QDialog { Q_OBJECT; public: - prefDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WFlags fl = 0); + prefDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~prefDialog(); protected slots: diff --git a/src/ui/quickdialog.cpp b/src/ui/quickdialog.cpp index ff14973..c8de4db 100644 --- a/src/ui/quickdialog.cpp +++ b/src/ui/quickdialog.cpp @@ -43,7 +43,7 @@ extern void saveAddress(FQTermConfig *, int, const FQTermParam &); const int quickDialog::ports[] = {23, 22, 22, 22}; -quickDialog::quickDialog(FQTermConfig * config, QWidget *parent, Qt::WFlags fl) +quickDialog::quickDialog(FQTermConfig * config, QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl), config_(config) { ui_.setupUi(this); diff --git a/src/ui/quickdialog.h b/src/ui/quickdialog.h index 27a843e..31f8633 100644 --- a/src/ui/quickdialog.h +++ b/src/ui/quickdialog.h @@ -36,7 +36,7 @@ class FQTermConfig; class quickDialog: public QDialog { Q_OBJECT; public: - quickDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WFlags fl = 0); + quickDialog(FQTermConfig *, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~quickDialog(); FQTermParam param_; diff --git a/src/ui/schemadialog.cpp b/src/ui/schemadialog.cpp index d5a197b..52aa09b 100644 --- a/src/ui/schemadialog.cpp +++ b/src/ui/schemadialog.cpp @@ -31,7 +31,7 @@ namespace FQTerm { -schemaDialog::schemaDialog(QWidget *parent, Qt::WFlags fl) +schemaDialog::schemaDialog(QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl), buttonGroup_(this) { ui_.setupUi(this); diff --git a/src/ui/schemadialog.h b/src/ui/schemadialog.h index c2ef977..dffbc0b 100644 --- a/src/ui/schemadialog.h +++ b/src/ui/schemadialog.h @@ -28,7 +28,7 @@ namespace FQTerm { class schemaDialog: public QDialog { Q_OBJECT; public: - schemaDialog(QWidget *parent = 0, Qt::WFlags fl = 0); + schemaDialog(QWidget *parent = 0, Qt::WindowFlags fl = 0); ~schemaDialog(); static QFileInfoList getSchemaList(); diff --git a/src/ui/shortcutdialog.cpp b/src/ui/shortcutdialog.cpp index 0b73ab3..4339ed2 100644 --- a/src/ui/shortcutdialog.cpp +++ b/src/ui/shortcutdialog.cpp @@ -32,7 +32,7 @@ #include namespace FQTerm { -FQTermShortcutDialog::FQTermShortcutDialog(FQTermShortcutHelper* helper, QWidget *parent_, Qt::WFlags fl) +FQTermShortcutDialog::FQTermShortcutDialog(FQTermShortcutHelper* helper, QWidget *parent_, Qt::WindowFlags fl) : QDialog(parent_, fl), helper_(helper), table_(NULL) { diff --git a/src/ui/shortcutdialog.h b/src/ui/shortcutdialog.h index d8fd109..df9439f 100644 --- a/src/ui/shortcutdialog.h +++ b/src/ui/shortcutdialog.h @@ -41,7 +41,7 @@ class FQTermShortcutDialog : public QDialog { Q_OBJECT; public: - FQTermShortcutDialog(FQTermShortcutHelper* helper, QWidget *parent_ = 0, Qt::WFlags fl = Qt::Dialog); + FQTermShortcutDialog(FQTermShortcutHelper* helper, QWidget *parent_ = 0, Qt::WindowFlags fl = Qt::Dialog); ~FQTermShortcutDialog(); private: FQTermShortcutHelper* helper_; diff --git a/src/ui/sitemanager.cpp b/src/ui/sitemanager.cpp index 29f2ccd..d7c0e28 100644 --- a/src/ui/sitemanager.cpp +++ b/src/ui/sitemanager.cpp @@ -39,7 +39,7 @@ namespace FQTerm{ int siteDialog::ports[] = {23, 22, 22, 0}; -siteDialog::siteDialog(QWidget *parent_ /*= 0*/, Qt::WFlags fl /*= 0*/) +siteDialog::siteDialog(QWidget *parent_ /*= 0*/, Qt::WindowFlags fl /*= 0*/) : QDialog(parent_, fl) { ui_.setupUi(this); diff --git a/src/ui/sitemanager.h b/src/ui/sitemanager.h index 6aae387..8e38eb6 100644 --- a/src/ui/sitemanager.h +++ b/src/ui/sitemanager.h @@ -35,7 +35,7 @@ class FQTermConfig; class siteDialog: public QDialog { Q_OBJECT; public: - siteDialog(QWidget *parent_ = 0, Qt::WFlags fl = 0);; + siteDialog(QWidget *parent_ = 0, Qt::WindowFlags fl = 0);; ~siteDialog(); FQTermParam currentParameter(); diff --git a/src/ui/soundconf.cpp b/src/ui/soundconf.cpp index 2681b83..d42456c 100644 --- a/src/ui/soundconf.cpp +++ b/src/ui/soundconf.cpp @@ -37,7 +37,7 @@ namespace FQTerm { * TRUE to construct a modal dialog. */ -soundConf::soundConf(FQTermConfig * config, QWidget *parent, Qt::WFlags fl) +soundConf::soundConf(FQTermConfig * config, QWidget *parent, Qt::WindowFlags fl) : QDialog(parent, fl), buttonGroup_(this), config_(config){ diff --git a/src/ui/soundconf.h b/src/ui/soundconf.h index 5b4fe4c..a07270d 100644 --- a/src/ui/soundconf.h +++ b/src/ui/soundconf.h @@ -32,7 +32,7 @@ class FQTermConfig; class soundConf: public QDialog { Q_OBJECT; public: - soundConf(FQTermConfig *, QWidget *parent_ = 0, Qt::WFlags fl = 0); + soundConf(FQTermConfig *, QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~soundConf(); void loadSetting(); void saveSetting(); diff --git a/src/ui/sshlogindialog.cpp b/src/ui/sshlogindialog.cpp index cd858cb..3b46a54 100644 --- a/src/ui/sshlogindialog.cpp +++ b/src/ui/sshlogindialog.cpp @@ -34,7 +34,7 @@ namespace FQTerm { * TRUE to construct a modal dialog. */ SSHLoginDialog::SSHLoginDialog(QString *username, QString *password, - QWidget *parent_, Qt::WFlags fl) + QWidget *parent_, Qt::WindowFlags fl) : QDialog(parent_, fl) { ui_.setupUi(this); setWindowTitle(parent_->windowTitle()); diff --git a/src/ui/sshlogindialog.h b/src/ui/sshlogindialog.h index e3295cc..72e5578 100644 --- a/src/ui/sshlogindialog.h +++ b/src/ui/sshlogindialog.h @@ -29,7 +29,7 @@ class SSHLoginDialog: public QDialog { Q_OBJECT; public: SSHLoginDialog(QString *username, QString *password, - QWidget *parent_ = 0, Qt::WFlags fl = 0); + QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~SSHLoginDialog(); private: QString *strUserName; diff --git a/src/ui/statusBar.cpp b/src/ui/statusBar.cpp index be48fc4..155f01d 100644 --- a/src/ui/statusBar.cpp +++ b/src/ui/statusBar.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -404,7 +404,7 @@ void StatusBar::abortAllProgressOperations() { //slot void StatusBar::toggleProgressWindow(bool show) { //slot popupProgressMessage_->adjustSize(); //FIXME shouldn't be needed, adding bars doesn't seem to do this - popupProgressMessage_->setShown(show); + popupProgressMessage_->setVisible(show); if (!show) { hideMainProgressBar(); @@ -492,7 +492,7 @@ void StatusBar::updateTotalProgress() { } void StatusBar::updateProgressAppearance() { - toggleProgressWindowButton()->setShown(progressMap_.count() > 1); + toggleProgressWindowButton()->setVisible(progressMap_.count() > 1); resetMainText(); @@ -521,7 +521,7 @@ void StatusBar::pruneProgressBars() { if (count == 1 && removedBar) { //if its gone from 2 or more bars to one bar... resetMainText(); (progressBox()->findChild < QWidget * > ("showAllProgressDetails"))->hide(); - popupProgressMessage_->setShown(false); + popupProgressMessage_->setVisible(false); } } diff --git a/src/ui/zmodemdialog.cpp b/src/ui/zmodemdialog.cpp index 629a40a..2f7a76e 100644 --- a/src/ui/zmodemdialog.cpp +++ b/src/ui/zmodemdialog.cpp @@ -25,7 +25,7 @@ namespace FQTerm { -zmodemDialog::zmodemDialog(QWidget *parent_, Qt::WFlags fl) +zmodemDialog::zmodemDialog(QWidget *parent_, Qt::WindowFlags fl) : QDialog(parent_, fl) { ui_.setupUi(this); FQ_VERIFY(connect(ui_.buttonCancel, SIGNAL(clicked()), this, SLOT(slotCancel()))); diff --git a/src/ui/zmodemdialog.h b/src/ui/zmodemdialog.h index f310b64..bbd7b77 100644 --- a/src/ui/zmodemdialog.h +++ b/src/ui/zmodemdialog.h @@ -28,7 +28,7 @@ namespace FQTerm { class zmodemDialog: public QDialog { Q_OBJECT; public: - zmodemDialog(QWidget *parent_ = 0, Qt::WFlags fl = 0); + zmodemDialog(QWidget *parent_ = 0, Qt::WindowFlags fl = 0); ~zmodemDialog(); void setFileInfo(const QString &, int); diff --git a/src/utilities/fqterm_ip_location.cpp b/src/utilities/fqterm_ip_location.cpp index e9777a7..0489c2c 100644 --- a/src/utilities/fqterm_ip_location.cpp +++ b/src/utilities/fqterm_ip_location.cpp @@ -202,7 +202,7 @@ bool FQTermIPLocation::getLocation(QString &url, QByteArray &country, record_count = (ipDatabase_->offset_last_start_ip - ipDatabase_->offset_first_start_ip) / 7; if (record_count <= 1) { - return FALSE; + return false; } // search for right range @@ -225,7 +225,7 @@ bool FQTermIPLocation::getLocation(QString &url, QByteArray &country, if (ipDatabase_->cur_start_ip <= ip && ip <= ipDatabase_->cur_end_ip) { getCountryCity(ipDatabase_->ipfp, ipDatabase_->offset_cur_end_ip + 4, country, city); - //country.replace( country.find( "CZ88.NET", 0, FALSE ), 8, "" ); + //country.replace( country.find( "CZ88.NET", 0, false ), 8, "" ); if ((rec = country.toUpper().indexOf("CZ88.NET", 0)) >= 0) { country.replace(rec, 8, "********"); } @@ -239,7 +239,7 @@ bool FQTermIPLocation::getLocation(QString &url, QByteArray &country, city = ""; } // if ip_start<=ip<=ip_end - return TRUE; + return true; } FQTermIPLocation* FQTermIPLocation::getInstance() { -- cgit v1.2.3