diff options
Diffstat (limited to 'kate')
-rw-r--r-- | kate/data/c.xml | 2 | ||||
-rw-r--r-- | kate/data/fgl-4gl.xml | 2 | ||||
-rw-r--r-- | kate/data/fgl-per.xml | 2 | ||||
-rw-r--r-- | kate/data/idl.xml | 2 | ||||
-rw-r--r-- | kate/data/nesc.xml | 2 | ||||
-rw-r--r-- | kate/data/objectivec.xml | 2 | ||||
-rw-r--r-- | kate/data/opencl.xml | 2 | ||||
-rw-r--r-- | kate/part/katecodecompletion.cpp | 2 | ||||
-rw-r--r-- | kate/part/kateconfig.cpp | 14 | ||||
-rw-r--r-- | kate/part/katedialogs.cpp | 14 | ||||
-rw-r--r-- | kate/part/katedocument.cpp | 2 | ||||
-rw-r--r-- | kate/part/katefiletype.cpp | 2 | ||||
-rw-r--r-- | kate/part/katehighlight.cpp | 54 | ||||
-rw-r--r-- | kate/part/kateprinter.cpp | 34 | ||||
-rw-r--r-- | kate/part/katerenderer.cpp | 2 | ||||
-rw-r--r-- | kate/part/kateschema.cpp | 16 | ||||
-rw-r--r-- | kate/part/katesearch.cpp | 4 | ||||
-rw-r--r-- | kate/part/katetemplatehandler.cpp | 4 | ||||
-rw-r--r-- | kate/part/kateview.cpp | 16 | ||||
-rw-r--r-- | kate/part/kateviewhelpers.cpp | 10 | ||||
-rw-r--r-- | kate/part/kateviewinternal.cpp | 48 | ||||
-rw-r--r-- | kate/plugins/isearch/ISearchPlugin.cpp | 2 |
22 files changed, 119 insertions, 119 deletions
diff --git a/kate/data/c.xml b/kate/data/c.xml index 501e865e3..aa250ec9c 100644 --- a/kate/data/c.xml +++ b/kate/data/c.xml @@ -197,7 +197,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/data/fgl-4gl.xml b/kate/data/fgl-4gl.xml index 7b2084dbd..b92523641 100644 --- a/kate/data/fgl-4gl.xml +++ b/kate/data/fgl-4gl.xml @@ -347,7 +347,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/fgl-per.xml b/kate/data/fgl-per.xml index 44bc53151..21d09df57 100644 --- a/kate/data/fgl-per.xml +++ b/kate/data/fgl-per.xml @@ -159,7 +159,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/idl.xml b/kate/data/idl.xml index a8a2787dd..06b37118b 100644 --- a/kate/data/idl.xml +++ b/kate/data/idl.xml @@ -100,7 +100,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" /> </itemDatas> </highlighting> diff --git a/kate/data/nesc.xml b/kate/data/nesc.xml index 5a5d0db54..688281bde 100644 --- a/kate/data/nesc.xml +++ b/kate/data/nesc.xml @@ -172,7 +172,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> </itemDatas> </highlighting> <general> diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml index a49ed574f..612c1a4f5 100644 --- a/kate/data/objectivec.xml +++ b/kate/data/objectivec.xml @@ -230,7 +230,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal"/> <itemData name="Preprocessor" defStyleNum="dsOthers"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> </itemDatas> </highlighting> <general> diff --git a/kate/data/opencl.xml b/kate/data/opencl.xml index 5c5cc7c5c..c4e2b3d39 100644 --- a/kate/data/opencl.xml +++ b/kate/data/opencl.xml @@ -241,7 +241,7 @@ <itemData name="Comment" defStyleNum="dsComment"/> <itemData name="Symbol" defStyleNum="dsNormal" spellChecking="false"/> <itemData name="Preprocessor" defStyleNum="dsOthers" spellChecking="false"/> - <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,Qt::darkYellow,Qt::yellow,false,false)); --> + <itemData name="Prep. Lib" defStyleNum="dsOthers" spellChecking="false"/> <!--,TQt::darkYellow,TQt::yellow,false,false)); --> <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/> <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/> <itemData name="Error" defStyleNum="dsError" spellChecking="false"/> diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index 86fecba1d..a161534e6 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -395,7 +395,7 @@ KateArgHint::KateArgHint( KateView* parent, const char* name ) : TQFrame( parent, name, (WFlags)WType_Popup ) { setBackgroundColor( black ); - setPaletteForegroundColor( Qt::black ); + setPaletteForegroundColor( TQt::black ); labelDict.setAutoDelete( true ); layout = new TQVBoxLayout( this, 1, 2 ); diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp index c9feae9da..7625af0eb 100644 --- a/kate/part/kateconfig.cpp +++ b/kate/part/kateconfig.cpp @@ -1155,13 +1155,13 @@ void KateRendererConfig::setSchemaInternal( int schema ) // same std colors like in KateDocument::markColor TQColor mark[7]; - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; for (int i = 1; i <= KTextEditor::MarkInterface::reservedMarkersCount(); i++) { TQColor col = config->readColorEntry(TQString("Color MarkType%1").arg(i), &mark[i - 1]); diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index 08b63eae3..a56e1a728 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -179,7 +179,7 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) opt[4] = new TQCheckBox(i18n("&Backspace key indents"), keys); TQRadioButton *rb1, *rb2, *rb3; - m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); + m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Tab Key Mode if Nothing Selected"), this ); m_tabs->setRadioButtonExclusive( true ); m_tabs->insert( rb1=new TQRadioButton( i18n("Insert indent &characters"), m_tabs ), 0 ); m_tabs->insert( rb2=new TQRadioButton( i18n("I&nsert tab character"), m_tabs ), 1 ); @@ -376,7 +376,7 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) TQRadioButton *rb1, *rb2; - m_tabs = new TQButtonGroup( 1, Qt::Horizontal, i18n("Selection Mode"), this ); + m_tabs = new TQButtonGroup( 1, TQt::Horizontal, i18n("Selection Mode"), this ); layout->add (m_tabs); m_tabs->setRadioButtonExclusive( true ); @@ -684,7 +684,7 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) blay->addWidget(gbBar); - m_bmSort = new TQButtonGroup( 1, Qt::Horizontal, i18n("Sort Bookmarks Menu"), this ); + m_bmSort = new TQButtonGroup( 1, TQt::Horizontal, i18n("Sort Bookmarks Menu"), this ); m_bmSort->setRadioButtonExclusive( true ); m_bmSort->insert( rb1=new TQRadioButton( i18n("By &position"), m_bmSort ), 0 ); m_bmSort->insert( rb2=new TQRadioButton( i18n("By c&reation"), m_bmSort ), 1 ); @@ -895,7 +895,7 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) dirSearchDepth->setSpecialValueText( i18n("Do not use config file") ); dirSearchDepth->setLabel(i18n("Se&arch depth for config file:"), AlignVCenter); - TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Backup on Save"), this ); + TQGroupBox *gb = new TQGroupBox( 1, TQt::Horizontal, i18n("Backup on Save"), this ); layout->addWidget( gb ); cbLocalFiles = new TQCheckBox( i18n("&Local files"), gb ); cbRemoteFiles = new TQCheckBox( i18n("&Remote files"), gb ); @@ -1130,7 +1130,7 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf btnConfigure = new TQPushButton( i18n("Configure..."), this ); btnConfigure->setEnabled( false ); - grid->addWidget( btnConfigure, 1, 0, Qt::AlignRight ); + grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight ); connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) ); connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); @@ -1276,7 +1276,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) hlCombo->insertItem(KateHlManager::self()->hlNameTranslated(i)); } - TQGroupBox *gbInfo = new TQGroupBox( 1, Qt::Horizontal, i18n("Information"), this ); + TQGroupBox *gbInfo = new TQGroupBox( 1, TQt::Horizontal, i18n("Information"), this ); layout->add (gbInfo); // author @@ -1290,7 +1290,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) new TQLabel( i18n("License:"), hb2 ); license = new TQLabel (hb2); - TQGroupBox *gbProps = new TQGroupBox( 1, Qt::Horizontal, i18n("Properties"), this ); + TQGroupBox *gbProps = new TQGroupBox( 1, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); // file & mime types diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 574236589..4309386e2 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -4654,7 +4654,7 @@ void KateDocument::readVariableLine( TQString t, bool onlyViewAndRenderer ) bool found = false; for (TQStringList::size_type i = 0; !found && i < wildcards.size(); ++i) { - TQRegExp wildcard (wildcards[i], true/*Qt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); + TQRegExp wildcard (wildcards[i], true/*TQt::CaseSensitive*/, true/*TQRegExp::Wildcard*/); found = wildcard.exactMatch (nameOfFile); } diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 974262290..7df5b6be5 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -282,7 +282,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) btndel = new TQPushButton( i18n("&Delete"), hbHl ); connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) ); - gbProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Properties"), this ); + gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); // file & mime types diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index ad4cc5abe..9e453aca1 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -3193,79 +3193,79 @@ void KateHlManager::getDefaults(uint schema, KateAttributeList &list) list.setAutoDelete(true); KateAttribute* normal = new KateAttribute(); - normal->setTextColor(Qt::black); - normal->setSelectedTextColor(Qt::white); + normal->setTextColor(TQt::black); + normal->setSelectedTextColor(TQt::white); list.append(normal); KateAttribute* keyword = new KateAttribute(); - keyword->setTextColor(Qt::black); - keyword->setSelectedTextColor(Qt::white); + keyword->setTextColor(TQt::black); + keyword->setSelectedTextColor(TQt::white); keyword->setBold(true); list.append(keyword); KateAttribute* dataType = new KateAttribute(); - dataType->setTextColor(Qt::darkRed); - dataType->setSelectedTextColor(Qt::white); + dataType->setTextColor(TQt::darkRed); + dataType->setSelectedTextColor(TQt::white); list.append(dataType); KateAttribute* decimal = new KateAttribute(); - decimal->setTextColor(Qt::blue); - decimal->setSelectedTextColor(Qt::cyan); + decimal->setTextColor(TQt::blue); + decimal->setSelectedTextColor(TQt::cyan); list.append(decimal); KateAttribute* basen = new KateAttribute(); - basen->setTextColor(Qt::darkCyan); - basen->setSelectedTextColor(Qt::cyan); + basen->setTextColor(TQt::darkCyan); + basen->setSelectedTextColor(TQt::cyan); list.append(basen); KateAttribute* floatAttribute = new KateAttribute(); - floatAttribute->setTextColor(Qt::darkMagenta); - floatAttribute->setSelectedTextColor(Qt::cyan); + floatAttribute->setTextColor(TQt::darkMagenta); + floatAttribute->setSelectedTextColor(TQt::cyan); list.append(floatAttribute); KateAttribute* charAttribute = new KateAttribute(); - charAttribute->setTextColor(Qt::magenta); - charAttribute->setSelectedTextColor(Qt::magenta); + charAttribute->setTextColor(TQt::magenta); + charAttribute->setSelectedTextColor(TQt::magenta); list.append(charAttribute); KateAttribute* string = new KateAttribute(); string->setTextColor(TQColor("#D00")); - string->setSelectedTextColor(Qt::red); + string->setSelectedTextColor(TQt::red); list.append(string); KateAttribute* comment = new KateAttribute(); - comment->setTextColor(Qt::darkGray); - comment->setSelectedTextColor(Qt::gray); + comment->setTextColor(TQt::darkGray); + comment->setSelectedTextColor(TQt::gray); comment->setItalic(true); list.append(comment); KateAttribute* others = new KateAttribute(); - others->setTextColor(Qt::darkGreen); - others->setSelectedTextColor(Qt::green); + others->setTextColor(TQt::darkGreen); + others->setSelectedTextColor(TQt::green); list.append(others); KateAttribute* alert = new KateAttribute(); - alert->setTextColor(Qt::black); + alert->setTextColor(TQt::black); alert->setSelectedTextColor( TQColor("#FCC") ); alert->setBold(true); alert->setBGColor( TQColor("#FCC") ); list.append(alert); KateAttribute* functionAttribute = new KateAttribute(); - functionAttribute->setTextColor(Qt::darkBlue); - functionAttribute->setSelectedTextColor(Qt::white); + functionAttribute->setTextColor(TQt::darkBlue); + functionAttribute->setSelectedTextColor(TQt::white); list.append(functionAttribute); KateAttribute* regionmarker = new KateAttribute(); - regionmarker->setTextColor(Qt::white); - regionmarker->setBGColor(Qt::gray); - regionmarker->setSelectedTextColor(Qt::gray); + regionmarker->setTextColor(TQt::white); + regionmarker->setBGColor(TQt::gray); + regionmarker->setSelectedTextColor(TQt::gray); list.append(regionmarker); KateAttribute* error = new KateAttribute(); - error->setTextColor(Qt::red); + error->setTextColor(TQt::red); error->setUnderline(true); - error->setSelectedTextColor(Qt::red); + error->setSelectedTextColor(TQt::red); list.append(error); TDEConfig *config = KateHlManager::self()->self()->getTDEConfig(); diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index e5e2969c0..45fc60c25 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -228,9 +228,9 @@ bool KatePrinter::print (KateDocument *doc) headerTagList = TQStringList::split('|', headerTags, true); if (!headerBgColor.isValid()) - headerBgColor = Qt::lightGray; + headerBgColor = TQt::lightGray; if (!headerFgColor.isValid()) - headerFgColor = Qt::black; + headerFgColor = TQt::black; } if (useFooter) @@ -255,9 +255,9 @@ bool KatePrinter::print (KateDocument *doc) footerTagList = TQStringList::split('|', footerTags, true); if (!footerBgColor.isValid()) - footerBgColor = Qt::lightGray; + footerBgColor = TQt::lightGray; if (!footerFgColor.isValid()) - footerFgColor = Qt::black; + footerFgColor = TQt::black; // adjust maxheight, so we can know when/where to print footer maxHeight -= footerHeight; } @@ -275,7 +275,7 @@ bool KatePrinter::print (KateDocument *doc) if ( useBox ) { if (!boxColor.isValid()) - boxColor = Qt::black; + boxColor = TQt::black; if (boxWidth < 1) // shouldn't be pssible no more! boxWidth = 1; // set maxwidth to something sensible @@ -307,7 +307,7 @@ bool KatePrinter::print (KateDocument *doc) // get a title and add the height required to draw it TQString _title = i18n("Typographical Conventions for %1").arg(doc->highlight()->name()); - guideHeight += paint.boundingRect( 0, 0, _w, 1000, Qt::AlignTop|Qt::AlignHCenter, _title ).height(); + guideHeight += paint.boundingRect( 0, 0, _w, 1000, TQt::AlignTop|TQt::AlignHCenter, _title ).height(); // see how many columns we can fit in int _widest( 0 ); @@ -417,8 +417,8 @@ bool KatePrinter::print (KateDocument *doc) if (headerTagList.count() == 3) { int valign = ( (useBox||headerDrawBg||useBackground) ? - Qt::AlignVCenter : Qt::AlignTop ); - int align = valign|Qt::AlignLeft; + TQt::AlignVCenter : TQt::AlignTop ); + int align = valign|TQt::AlignLeft; int marg = ( useBox || headerDrawBg ) ? innerMargin : 0; if ( useBox ) marg += boxWidth; TQString s; @@ -427,7 +427,7 @@ bool KatePrinter::print (KateDocument *doc) s = headerTagList[i]; if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, 0, headerWidth-(marg*2), headerHeight, align, s); - align = valign|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); + align = valign|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight); } } if ( ! ( headerDrawBg || useBox || useBackground ) ) // draw a 1 px (!?) line to separate header from contents @@ -446,7 +446,7 @@ bool KatePrinter::print (KateDocument *doc) paint.fillRect(0, maxHeight+innerMargin+boxWidth, headerWidth, footerHeight, footerBgColor); if (footerTagList.count() == 3) { - int align = Qt::AlignVCenter|Qt::AlignLeft; + int align = TQt::AlignVCenter|TQt::AlignLeft; int marg = ( useBox || footerDrawBg ) ? innerMargin : 0; if ( useBox ) marg += boxWidth; TQString s; @@ -455,7 +455,7 @@ bool KatePrinter::print (KateDocument *doc) s = footerTagList[i]; if (s.find("%p") != -1) s.replace("%p", TQString::number(currentPage)); paint.drawText(marg, maxHeight+innerMargin, headerWidth-(marg*2), footerHeight, align, s); - align = Qt::AlignVCenter|(i == 0 ? Qt::AlignHCenter : Qt::AlignRight); + align = TQt::AlignVCenter|(i == 0 ? TQt::AlignHCenter : TQt::AlignRight); } } } // done footer @@ -524,7 +524,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setFont( renderer.config()->fontStruct()->myFontBold ); TQRect _r; paint.drawText( _marg, y, pdmWidth-(2*_marg), maxHeight - y, - Qt::AlignTop|Qt::AlignHCenter, + TQt::AlignTop|TQt::AlignHCenter, i18n("Typographical Conventions for %1").arg(doc->highlight()->name()), -1, &_r ); int _w = pdmWidth - (_marg*2) - (innerMargin*2); int _x = _marg + innerMargin; @@ -543,7 +543,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setPen( renderer.attribute(_i)->textColor() ); paint.setFont( renderer.attribute(_i)->font( *renderer.currentFont() ) ); paint.drawText(( _x + ((_i%guideCols)*_cw)), y, _cw, renderer.fontHeight(), - Qt::AlignVCenter|Qt::AlignLeft, _d->name, -1, &_r ); + TQt::AlignVCenter|TQt::AlignLeft, _d->name, -1, &_r ); _i++; if ( _i && ! ( _i%guideCols ) ) y += renderer.fontHeight(); ++_it; @@ -561,7 +561,7 @@ bool KatePrinter::print (KateDocument *doc) paint.setPen( renderer.config()->lineNumberColor() ); paint.drawText( (( useBox || useBackground ) ? innerMargin : 0), y, lineNumberWidth, renderer.fontHeight(), - Qt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); + TQt::AlignRight, TQString("%1").arg( lineCount + 1 ) ); } endCol = renderer.textWidth(doc->kateTextLine(lineCount), startCol, maxWidth, &needWrap); @@ -721,7 +721,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo2->addWidget( btnChooseFont ); connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) ); // header - gbHeader = new TQGroupBox( 2, Qt::Horizontal, i18n("Header Properties"), this ); + gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this ); lo->addWidget( gbHeader ); TQLabel *lHeaderFormat = new TQLabel( i18n("&Format:"), gbHeader ); @@ -740,7 +740,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * cbHeaderEnableBgColor = new TQCheckBox( i18n("Bac&kground"), hbHeaderColors ); kcbtnHeaderBg = new KColorButton( hbHeaderColors ); - gbFooter = new TQGroupBox( 2, Qt::Horizontal, i18n("Footer Properties"), this ); + gbFooter = new TQGroupBox( 2, TQt::Horizontal, i18n("Footer Properties"), this ); lo->addWidget( gbFooter ); // footer @@ -922,7 +922,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons cbEnableBox = new TQCheckBox( i18n("Draw &boxes"), this ); lo->addWidget( cbEnableBox ); - gbBoxProps = new TQGroupBox( 2, Qt::Horizontal, i18n("Box Properties"), this ); + gbBoxProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Box Properties"), this ); lo->addWidget( gbBoxProps ); TQLabel *lBoxWidth = new TQLabel( i18n("W&idth:"), gbBoxProps ); diff --git a/kate/part/katerenderer.cpp b/kate/part/katerenderer.cpp index a6c524f73..67afb4bd6 100644 --- a/kate/part/katerenderer.cpp +++ b/kate/part/katerenderer.cpp @@ -352,7 +352,7 @@ void KateRenderer::paintTextLine(TQPainter& paint, const KateLineRange* range, i // Draws the dashed underline at the start of a folded block of text. if (range->startsInvisibleBlock) { - paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, Qt::DashLine)); + paint.setPen(TQPen(config()->wordWrapMarkerColor(), 1, TQt::DashLine)); paint.drawLine(0, fs->fontHeight - 1, xEnd - xStart, fs->fontHeight - 1); } diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index b23563e11..cea62b652 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -431,13 +431,13 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) // same std colors like in KateDocument::markColor TQValueVector <TQColor> mark(KTextEditor::MarkInterface::reservedMarkersCount()); Q_ASSERT(mark.size() > 6); - mark[0] = Qt::blue; - mark[1] = Qt::red; - mark[2] = Qt::yellow; - mark[3] = Qt::magenta; - mark[4] = Qt::gray; - mark[5] = Qt::green; - mark[6] = Qt::red; + mark[0] = TQt::blue; + mark[1] = TQt::red; + mark[2] = TQt::yellow; + mark[3] = TQt::magenta; + mark[4] = TQt::gray; + mark[5] = TQt::green; + mark[6] = TQt::red; SchemaColors c; TDEConfig *config = KateFactory::self()->schemaManager()->schema(newSchema); @@ -1153,7 +1153,7 @@ void KateStyleListView::unsetColor( int c ) void KateStyleListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast<KateStyleListItem*>(i) ) { - if ( btn == Qt::LeftButton && c > 0 ) { + if ( btn == TQt::LeftButton && c > 0 ) { // map pos to item/column and call KateStyleListItem::activate(col, pos) ((KateStyleListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); } diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index a02bbef71..187bc2fa2 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -729,8 +729,8 @@ bool KateSearch::doSearch( const TQString& text ) if (arbitraryHLExample) { KateArbitraryHighlightRange* hl = new KateArbitraryHighlightRange(new KateSuperCursor(m_doc, true, s.cursor), new KateSuperCursor(m_doc, true, s.cursor.line(), s.cursor.col() + s.matchedLength), this); hl->setBold(); - hl->setTextColor(Qt::white); - hl->setBGColor(Qt::black); + hl->setTextColor(TQt::white); + hl->setBGColor(TQt::black); // destroy the highlight upon change connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated())); m_arbitraryHLList->append(hl); diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index 52e07a2e4..9607f6b9a 100644 --- a/kate/part/katetemplatehandler.cpp +++ b/kate/part/katetemplatehandler.cpp @@ -124,7 +124,7 @@ KateTemplateHandler::KateTemplateHandler( connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); - ( *this ) ( Qt::Key_Tab ); + ( *this ) ( TQt::Key_Tab ); } KateTemplateHandler::~KateTemplateHandler() @@ -283,7 +283,7 @@ void KateTemplateHandler::locateRange( const KateTextCursor& cursor ) bool KateTemplateHandler::operator() ( KKey key ) { - if ( key==Qt::Key_Tab ) + if ( key==TQt::Key_Tab ) { m_currentTabStop++; diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index 6d56f6560..b40e3c19c 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -241,10 +241,10 @@ void KateView::setupActions() " when the view is resized.")); // setup Tools menu - a=new TDEAction(i18n("&Indent"), "format-indent-more", Qt::CTRL+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.<br><br>" "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Unindent"), "format-indent-less", Qt::CTRL+Qt::SHIFT+Qt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, TQT_TQOBJECT(this), TQT_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); a=new TDEAction(i18n("&Clean Indentation"), 0, TQT_TQOBJECT(this), TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); @@ -254,12 +254,12 @@ void KateView::setupActions() a=new TDEAction(i18n("&Align"), 0, TQT_TQOBJECT(this), TQT_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new TDEAction(i18n("C&omment"), CTRL+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+Qt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.<BR><BR>" "The characters for single/multiple line comments are defined within the language's highlighting.")); @@ -269,17 +269,17 @@ void KateView::setupActions() ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); - a = new TDEAction( i18n("Uppercase"), CTRL + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); - a = new TDEAction( i18n("Capitalize"), CTRL + ALT + Qt::Key_U, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, TQT_TQOBJECT(this), TQT_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); @@ -288,7 +288,7 @@ void KateView::setupActions() TQT_SLOT( killLine() ), ac, "tools_delete_line"); a->setWhatsThis(i18n("Use this to delete the current line.")); - a = new TDEAction( i18n("Join Lines"), CTRL + Qt::Key_J, TQT_TQOBJECT(this), + a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, TQT_TQOBJECT(this), TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); a->setWhatsThis(i18n("Use this to join lines together.")); } diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index 1074615f8..eb09efe41 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -73,7 +73,7 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent, void KateScrollBar::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) m_middleMouseDown = true; TQScrollBar::mousePressEvent(e); @@ -94,7 +94,7 @@ void KateScrollBar::mouseMoveEvent(TQMouseEvent* e) { TQScrollBar::mouseMoveEvent(e); - if (e->state() | Qt::LeftButton) + if (e->state() | TQt::LeftButton) redrawMarks(); } @@ -953,7 +953,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height) if (realLine > -1) if (m_viewInternal->lineRanges[z].startCol == 0) { if (m_lineNumbersOn) - p.drawText( lnX + 1, y, lnWidth-4, h, Qt::AlignRight|Qt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); + p.drawText( lnX + 1, y, lnWidth-4, h, TQt::AlignRight|TQt::AlignVCenter, TQString("%1").arg( realLine + 1 ) ); } else if (m_view->dynWordWrap() && m_dynWrapIndicatorsOn) { p.drawPixmap(lnX + lnWidth - m_arrow.width() - 4, y, m_arrow); } @@ -1069,7 +1069,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e ) { BorderArea area = positionToArea( e->pos() ); if( area == IconBorder) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if( m_doc->editableMarks() & KateViewConfig::global()->defaultMarkType() ) { if( m_doc->mark( cursorOnLine ) & KateViewConfig::global()->defaultMarkType() ) m_doc->removeMark( cursorOnLine, KateViewConfig::global()->defaultMarkType() ); @@ -1080,7 +1080,7 @@ void KateIconBorder::mouseReleaseEvent( TQMouseEvent* e ) } } else - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { showMarkMenu( cursorOnLine, TQCursor::pos() ); } } diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 91f827d91..406d14b24 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -94,7 +94,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // // scrollbar for lines // - m_lineScroll = new KateScrollBar(Qt::Vertical, this); + m_lineScroll = new KateScrollBar(TQt::Vertical, this); m_lineScroll->show(); m_lineScroll->setTracking (true); @@ -131,7 +131,7 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) // // scrollbar for columns // - m_columnScroll = new TQScrollBar(Qt::Horizontal,m_view); + m_columnScroll = new TQScrollBar(TQt::Horizontal,m_view); // hide the column scrollbar in the dynamic word wrap mode if (m_view->dynWordWrap()) @@ -1216,7 +1216,7 @@ void KateViewInternal::moveEdge( Bias bias, bool sel ) void KateViewInternal::home( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1257,7 +1257,7 @@ void KateViewInternal::home( bool sel ) void KateViewInternal::end( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1687,7 +1687,7 @@ int KateViewInternal::lineMaxCol(const KateLineRange& range) void KateViewInternal::cursorUp(bool sel) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Up, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Up, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1754,7 +1754,7 @@ void KateViewInternal::cursorUp(bool sel) void KateViewInternal::cursorDown(bool sel) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Down, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Down, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1889,7 +1889,7 @@ void KateViewInternal::setAutoCenterLines(int viewLines, bool updateView) void KateViewInternal::pageUp( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageUp, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageUp, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -1938,7 +1938,7 @@ void KateViewInternal::pageUp( bool sel ) void KateViewInternal::pageDown( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_PageDown, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_PageDown, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2025,7 +2025,7 @@ void KateViewInternal::bottom( bool sel ) void KateViewInternal::top_home( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_Home, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_Home, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2037,7 +2037,7 @@ void KateViewInternal::top_home( bool sel ) void KateViewInternal::bottom_end( bool sel ) { if (m_view->m_codeCompletion->codeCompletionVisible()) { - TQKeyEvent e(TQEvent::KeyPress, Qt::Key_End, 0, 0); + TQKeyEvent e(TQEvent::KeyPress, TQt::Key_End, 0, 0); m_view->m_codeCompletion->handleKey(&e); return; } @@ -2465,7 +2465,7 @@ bool KateViewInternal::eventFilter( TQObject *obj, TQEvent *e ) m_view->m_codeCompletion->abortCompletion(); } - if ((k->key() == Qt::Key_Escape) && !m_view->config()->persistentSelection() ) + if ((k->key() == TQt::Key_Escape) && !m_view->config()->persistentSelection() ) { m_view->clearSelection(); return true; @@ -2525,7 +2525,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) kdDebug (13030) << "hint around" << endl; if( e->key() == Key_Enter || e->key() == Key_Return || - (key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) { + (key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) { m_view->m_codeCompletion->doComplete(); e->accept(); return; @@ -2538,14 +2538,14 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if ((key == Qt::Key_Return) || (key == Qt::Key_Enter)) + if ((key == TQt::Key_Return) || (key == TQt::Key_Enter)) { m_view->keyReturn(); e->accept(); return; } - if ((key == SHIFT + Qt::Key_Return) || (key == SHIFT + Qt::Key_Enter)) + if ((key == SHIFT + TQt::Key_Return) || (key == SHIFT + TQt::Key_Enter)) { uint ln = cursor.line(); int col = cursor.col(); @@ -2573,7 +2573,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == Qt::Key_Backspace || key == SHIFT + Qt::Key_Backspace) + if (key == TQt::Key_Backspace || key == SHIFT + TQt::Key_Backspace) { m_view->backspace(); e->accept(); @@ -2584,7 +2584,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == Qt::Key_Tab || key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) + if (key == TQt::Key_Tab || key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab) { if (m_doc->invokeTabInterceptor(key)) { e->accept(); @@ -2592,7 +2592,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) } else if (m_doc->configFlags() & KateDocumentConfig::cfTabIndents) { - if( key == Qt::Key_Tab ) + if( key == TQt::Key_Tab ) { if (m_view->hasSelection() || (m_doc->configFlags() & KateDocumentConfig::cfTabIndentsMode)) m_doc->indent( m_view, cursor.line(), 1 ); @@ -2609,7 +2609,7 @@ void KateViewInternal::keyPressEvent( TQKeyEvent* e ) return; } - if (key == SHIFT+Qt::Key_Backtab || key == Qt::Key_Backtab) + if (key == SHIFT+TQt::Key_Backtab || key == TQt::Key_Backtab) { m_doc->indent( m_view, cursor.line(), -1 ); e->accept(); @@ -2693,7 +2693,7 @@ void KateViewInternal::mousePressEvent( TQMouseEvent* e ) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selChangedByUser = false; if (possibleTripleClick) @@ -2820,7 +2820,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selectionMode = Word; if ( e->state() & TQt::ShiftButton ) @@ -2927,7 +2927,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) { switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: m_selectionMode = Default; // selStartCached.setLine( -1 ); @@ -2956,7 +2956,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) e->accept (); break; - case Qt::MidButton: + case TQt::MidButton: placeCursor( e->pos() ); if( m_doc->isReadWrite() ) @@ -2977,7 +2977,7 @@ void KateViewInternal::mouseReleaseEvent( TQMouseEvent* e ) void KateViewInternal::mouseMoveEvent( TQMouseEvent* e ) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) { if (dragInfo.state == diPending) { @@ -3276,7 +3276,7 @@ void KateViewInternal::wheelEvent(TQWheelEvent* e) } else { - if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != Qt::Horizontal) + if (m_lineScroll->minValue() != m_lineScroll->maxValue() && e->orientation() != TQt::Horizontal) { // React to this as a vertical event if ( e->state() & ShiftButton ) diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index 823c44bc7..a7982f63c 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -225,7 +225,7 @@ bool ISearchPluginView::eventFilter( TQObject* o, TQEvent* e ) if( e->type() == TQEvent::KeyPress ) { TQKeyEvent *keyEvent = (TQKeyEvent*)e; - if( keyEvent->key() == Qt::Key_Escape ) + if( keyEvent->key() == TQt::Key_Escape ) quitToView( TQString::null ); } |