diff options
Diffstat (limited to 'kexi/plugins')
-rw-r--r-- | kexi/plugins/forms/widgets/kexidbcombobox.cpp | 10 | ||||
-rw-r--r-- | kexi/plugins/forms/widgets/kexidbform.cpp | 12 | ||||
-rw-r--r-- | kexi/plugins/forms/widgets/kexidbimagebox.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/importexport/csv/kexicsvexport.cpp | 6 | ||||
-rw-r--r-- | kexi/plugins/importexport/csv/kexicsvexportwizard.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/importexport/csv/kexicsvimportdialog.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiquerydesignerguieditor.cpp | 10 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiquerydesignersql.cpp | 6 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiquerydesignersqlhistory.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/reports/reportwidgets.cpp | 2 | ||||
-rw-r--r-- | kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp | 2 |
11 files changed, 28 insertions, 28 deletions
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index afe2e3aa..d9e33b9b 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -239,7 +239,7 @@ TQRect KexiDBComboBox::buttonGeometry() const bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) { - if ( e->button() != Qt::LeftButton || d->designMode ) + if ( e->button() != TQt::LeftButton || d->designMode ) return true; /*todo if ( m_discardNextMousePress ) { d->discardNextMousePress = FALSE; @@ -270,9 +270,9 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) bool KexiDBComboBox::handleKeyPressEvent(TQKeyEvent *ke) { const int k = ke->key(); - const bool dropDown = (ke->state() == Qt::NoButton && ((k==TQt::Key_F2 && !d->isEditable) || k==TQt::Key_F4)) + const bool dropDown = (ke->state() == TQt::NoButton && ((k==TQt::Key_F2 && !d->isEditable) || k==TQt::Key_F4)) || (ke->state() == TQt::AltButton && k==TQt::Key_Down); - const bool escPressed = ke->state() == Qt::NoButton && k==TQt::Key_Escape; + const bool escPressed = ke->state() == TQt::NoButton && k==TQt::Key_Escape; const bool popupVisible = popup() && popup()->isVisible(); if ((dropDown || escPressed) && popupVisible) { popup()->hide(); @@ -302,12 +302,12 @@ bool KexiDBComboBox::keyPressed(TQKeyEvent *ke) const int k = ke->key(); const bool popupVisible = popup() && popup()->isVisible(); - const bool escPressed = ke->state() == Qt::NoButton && k==TQt::Key_Escape; + const bool escPressed = ke->state() == TQt::NoButton && k==TQt::Key_Escape; if (escPressed && popupVisible) { popup()->hide(); return true; } - if (ke->state() == Qt::NoButton && (k==TQt::Key_PageDown || k==TQt::Key_PageUp) && popupVisible) + if (ke->state() == TQt::NoButton && (k==TQt::Key_PageDown || k==TQt::Key_PageUp) && popupVisible) return true; return false; } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index a6603867..0fb4519e 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -396,8 +396,8 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (preview()) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int key = ke->key(); - bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab; - bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) + bool tab = ke->state() == TQt::NoButton && key == TQt::Key_Tab; + bool backtab = ((ke->state() == TQt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) || (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab); TQObject *o = watched; //focusWidget(); TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling) @@ -405,9 +405,9 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (!tab && !backtab) { //for buttons, left/up and right/down keys act like tab/backtab (see qbutton.cpp) if (realWidget->inherits("TQButton")) { - if (ke->state() == Qt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) + if (ke->state() == TQt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) tab = true; - else if (ke->state() == Qt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) + else if (ke->state() == TQt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) backtab = true; } } @@ -437,7 +437,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) int curCol = d->dataAwareObject->currentColumn(); bool moveToFirstField; //if true, we'll move focus to the first field (in tab order) bool moveToLastField; //if true, we'll move focus to the first field (in tab order) - if (! (ke->state() == Qt::NoButton && (key == TQt::Key_Home + if (! (ke->state() == TQt::NoButton && (key == TQt::Key_Home || key == TQt::Key_End || key == TQt::Key_Down || key == TQt::Key_Up)) /* ^^ home/end/down/up are already handled by widgets */ && d->dataAwareObject->handleKeyPress( @@ -474,7 +474,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) } } // handle Esc key - if (ke->state() == Qt::NoButton && key == TQt::Key_Escape) { + if (ke->state() == TQt::NoButton && key == TQt::Key_Escape) { //cancel field editing/row editing if possible if (d->dataAwareObject->cancelEditor()) return true; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 1d81cc1c..f205de05 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -773,7 +773,7 @@ void KexiDBImageBox::setColumnInfo(KexiDB::QueryColumnInfo* cinfo) bool KexiDBImageBox::keyPressed(TQKeyEvent *ke) { // Esc key should close the popup - if (ke->state() == Qt::NoButton && ke->key() == TQt::Key_Escape) { + if (ke->state() == TQt::NoButton && ke->key() == TQt::Key_Escape) { if (m_popupMenu->isVisible()) { m_setFocusOnButtonAfterClosingPopup = true; return true; diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 7b369c60..ee606300 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -223,11 +223,11 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, APPEND( cursor->value(real_i).toString() ); } else if (isDateTime[real_i]) { //avoid "T" in ISO DateTime - APPEND( cursor->value(real_i).toDateTime().date().toString(Qt::ISODate)+" " - + cursor->value(real_i).toDateTime().time().toString(Qt::ISODate) ); + APPEND( cursor->value(real_i).toDateTime().date().toString(TQt::ISODate)+" " + + cursor->value(real_i).toDateTime().time().toString(TQt::ISODate) ); } else if (isTime[real_i]) { //time is temporarily stored as null date + time... - APPEND( cursor->value(real_i).toTime().toString(Qt::ISODate) ); + APPEND( cursor->value(real_i).toTime().toString(TQt::ISODate) ); } else if (isBLOB[real_i]) { //BLOB is escaped in a special way if (hasTextQuote) diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index b2d3940c..19e30f24 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -140,7 +140,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); // -<options section> - m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage, + m_exportOptionsSection = new TQGroupBox(1,TQt::Vertical, i18n("Options"), m_exportOptionsPage, "m_exportOptionsSection"); m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index cccc5f8b..daf536c5 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -1078,7 +1078,7 @@ bool KexiCSVImportDialog::parseDate(const TQString& text, TQDate& date) bool KexiCSVImportDialog::parseTime(const TQString& text, TQTime& time) { - time = TQTime::fromString(text, Qt::ISODate); //same as m_timeRegExp1 + time = TQTime::fromString(text, TQt::ISODate); //same as m_timeRegExp1 if (time.isValid()) return true; if (m_timeRegExp2.exactMatch(text)) { //hh:mm:ss diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 582d79e6..6d5d557c 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -145,7 +145,7 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( { d->conn = mainWin->project()->dbConnection(); - d->spl = new TQSplitter(Qt::Vertical, this); + d->spl = new TQSplitter(TQt::Vertical, this); d->spl->setChildrenCollapsible(false); d->relations = new KexiRelationWidget(mainWin, d->spl, "relations"); connect(d->relations, TQT_SIGNAL(tableAdded(KexiDB::TableSchema&)), @@ -155,7 +155,7 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( connect(d->relations, TQT_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), this, TQT_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); - d->head = new KexiSectionHeader(i18n("Query Columns"),Qt::Vertical, d->spl); + d->head = new KexiSectionHeader(i18n("Query Columns"),TQt::Vertical, d->spl); d->dataTable = new KexiDataTable(mainWin, d->head, "guieditor_dataTable", false); d->dataTable->dataAwareObject()->setSpreadSheetMode(); @@ -1349,7 +1349,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in { valueExpr = new KexiDB::ConstExpr(DATE_CONST, TQDate::fromString( re.cap(1).rightJustify(4, '0')+"-"+re.cap(2).rightJustify(2, '0') - +"-"+re.cap(3).rightJustify(2, '0'), Qt::ISODate)); + +"-"+re.cap(3).rightJustify(2, '0'), TQt::ISODate)); } else if ((re = TQRegExp("(\\d{1,2}):(\\d{1,2})")).exactMatch( str ) || (re = TQRegExp("(\\d{1,2}):(\\d{1,2}):(\\d{1,2})")).exactMatch( str )) @@ -1357,7 +1357,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in TQString res = re.cap(1).rightJustify(2, '0')+":"+re.cap(2).rightJustify(2, '0') +":"+re.cap(3).rightJustify(2, '0'); // kexipluginsdbg << res << endl; - valueExpr = new KexiDB::ConstExpr(TIME_CONST, TQTime::fromString(res, Qt::ISODate)); + valueExpr = new KexiDB::ConstExpr(TIME_CONST, TQTime::fromString(res, TQt::ISODate)); } else if ((re = TQRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})\\s+(\\d{1,2}):(\\d{1,2})")).exactMatch( str ) || (re = TQRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})\\s+(\\d{1,2}):(\\d{1,2}):(\\d{1,2})")).exactMatch( str )) @@ -1368,7 +1368,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in +":"+re.cap(6).rightJustify(2, '0'); // kexipluginsdbg << res << endl; valueExpr = new KexiDB::ConstExpr(DATETIME_CONST, - TQDateTime::fromString(res, Qt::ISODate)); + TQDateTime::fromString(res, TQt::ISODate)); } else if (str[0]>='0' && str[0]<='9' || str[0]=='-' || str[0]=='+') { //number diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 5e076cb4..be57a766 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -104,8 +104,8 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi , d( new Private() ) { d->splitter = new TQSplitter(this); - d->splitter->setOrientation(Qt::Vertical); - d->head = new KexiSectionHeader(i18n("SQL Query Text"),Qt::Vertical, d->splitter); + d->splitter->setOrientation(TQt::Vertical); + d->head = new KexiSectionHeader(i18n("SQL Query Text"),TQt::Vertical, d->splitter); d->editor = new KexiQueryDesignerSQLEditor(mainWin, d->head, "sqle"); // d->editor->installEventFilter(this);//for keys connect(d->editor, TQT_SIGNAL(textChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged())); @@ -140,7 +140,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode())); d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); - d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section); + d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),TQt::Vertical, d->history_section); d->historyHead->installEventFilter(this); d->history = new KexiQueryDesignerSQLHistory(d->historyHead, "sql_history"); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index fba543db..883bf3ca 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -100,7 +100,7 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) m_selected = popupHistory; m_selected->setSelected(true, colorGroup()); updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics())); - if(e->button() == Qt::RightButton) { + if(e->button() == TQt::RightButton) { m_popup->exec(e->globalPos()); } } diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp index 7cea50a3..08b41a37 100644 --- a/kexi/plugins/reports/reportwidgets.cpp +++ b/kexi/plugins/reports/reportwidgets.cpp @@ -104,7 +104,7 @@ ReportLine::paintEvent (TQPaintEvent *ev) TQPainter p(this); if(!ev->erased()) p.eraseRect(0, 0, width(), height()); - TQPen pen(m_color, m_lineWidth, (Qt::PenStyle)m_lineStyle); + TQPen pen(m_color, m_lineWidth, (TQt::PenStyle)m_lineStyle); pen.setCapStyle((TQt::PenCapStyle)m_capStyle); p.setPen(pen); p.drawLine(0, 0, width() -1, height() - 1); diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index e991d61d..6de68b7d 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -72,7 +72,7 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa d->updatesProperties = false; TQSplitter* splitter = new TQSplitter(this); - splitter->setOrientation(Qt::Vertical); + splitter->setOrientation(TQt::Vertical); TQHBoxLayout* layout = new TQHBoxLayout(this); layout->addWidget(splitter); |