From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:43 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- quanta/components/csseditor/colorrequester.cpp | 2 +- quanta/components/csseditor/colorslider.cpp | 6 +-- quanta/components/csseditor/csseditor.cpp | 6 +-- quanta/components/csseditor/csseditors.ui | 12 +++--- quanta/components/csseditor/cssselector.cpp | 2 +- quanta/components/csseditor/cssselectors.ui | 50 +++++++++++------------ quanta/components/csseditor/data/config.xml | 8 ++-- quanta/components/csseditor/encodingselector.cpp | 2 +- quanta/components/csseditor/encodingselectors.ui | 8 ++-- quanta/components/csseditor/fontfamilychooser.cpp | 12 +++--- quanta/components/csseditor/fontfamilychoosers.ui | 44 ++++++++++---------- quanta/components/csseditor/propertysetter.cpp | 2 +- quanta/components/csseditor/styleeditor.cpp | 2 +- quanta/components/csseditor/stylesheetparser.cpp | 4 +- quanta/components/csseditor/tlpeditors.cpp | 2 +- 15 files changed, 81 insertions(+), 81 deletions(-) (limited to 'quanta/components/csseditor') diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 1e2a1b8b..7538ebe9 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -56,7 +56,7 @@ void colorRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index 58e67d0f..411f056c 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -37,9 +37,9 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, TQLabel *leftLabel = new TQLabel("" + l +"",leftBox); TQLabel *centerLabel = new TQLabel(("" + c +""),centerBox); TQLabel *rightLabel = new TQLabel(("" + r +""),rightBox); - leftLabel->tqsetAlignment(TQt::AlignHCenter); - centerLabel->tqsetAlignment(TQt::AlignHCenter); - rightLabel->tqsetAlignment(TQt::AlignHCenter); + leftLabel->setAlignment(TQt::AlignHCenter); + centerLabel->setAlignment(TQt::AlignHCenter); + rightLabel->setAlignment(TQt::AlignHCenter); leftLabel->setTextFormat (TQt::RichText ) ; centerLabel->setTextFormat ( TQt::RichText ) ; rightLabel->setTextFormat (TQt::RichText ) ; diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index e548d7d9..7f65e9c7 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -16,12 +16,12 @@ ***************************************************************************/ #include "csseditor.h" -#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui index d1fe0993..2661d75d 100644 --- a/quanta/components/csseditor/csseditors.ui +++ b/quanta/components/csseditor/csseditors.ui @@ -32,7 +32,7 @@ Expanding - + 280 20 @@ -41,7 +41,7 @@ - tqlayout6 + layout6 @@ -117,13 +117,13 @@ 0 - + 33 7 - + 290 32767 @@ -338,7 +338,7 @@ 0 - + 0 200 @@ -363,7 +363,7 @@ 0 - + 32766 32766 diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 7e61cf02..cdf9db04 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui index dd899b1b..cb4ed81b 100644 --- a/quanta/components/csseditor/cssselectors.ui +++ b/quanta/components/csseditor/cssselectors.ui @@ -24,7 +24,7 @@ - tqlayout11 + layout11 @@ -61,7 +61,7 @@ Expanding - + 20 40 @@ -70,7 +70,7 @@ - tqlayout1 + layout1 @@ -111,7 +111,7 @@ - tqlayout13 + layout13 @@ -127,7 +127,7 @@ Expanding - + 20 16 @@ -185,7 +185,7 @@ Expanding - + 20 16 @@ -220,7 +220,7 @@ Expanding - + 20 24 @@ -266,7 +266,7 @@ Expanding - + 20 16 @@ -329,7 +329,7 @@ Minimum - + 40 20 @@ -403,7 +403,7 @@ Expanding - + 40 20 @@ -412,7 +412,7 @@ - tqlayout14 + layout14 @@ -428,7 +428,7 @@ Expanding - + 20 40 @@ -478,7 +478,7 @@ Expanding - + 20 40 @@ -521,7 +521,7 @@ Expanding - + 20 40 @@ -597,7 +597,7 @@ Expanding - + 40 20 @@ -606,7 +606,7 @@ - tqlayout13 + layout13 @@ -622,7 +622,7 @@ Expanding - + 20 40 @@ -672,7 +672,7 @@ Expanding - + 20 40 @@ -715,7 +715,7 @@ Expanding - + 20 40 @@ -791,7 +791,7 @@ Expanding - + 40 20 @@ -800,7 +800,7 @@ - tqlayout17 + layout17 @@ -816,7 +816,7 @@ Expanding - + 20 40 @@ -866,7 +866,7 @@ Expanding - + 20 40 @@ -917,7 +917,7 @@ Expanding - + 20 40 @@ -939,7 +939,7 @@ Expanding - + 380 20 diff --git a/quanta/components/csseditor/data/config.xml b/quanta/components/csseditor/data/config.xml index 988041ca..15fd659f 100644 --- a/quanta/components/csseditor/data/config.xml +++ b/quanta/components/csseditor/data/config.xml @@ -469,9 +469,9 @@ - + - + @@ -503,9 +503,9 @@ - + - + diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index f8ba4ac6..4aef2399 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -20,7 +20,7 @@ #include "encodingselector.h" #include #include -#include +#include /** *@author gulmini luciano diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui index 6ac64343..178eacc4 100644 --- a/quanta/components/csseditor/encodingselectors.ui +++ b/quanta/components/csseditor/encodingselectors.ui @@ -21,7 +21,7 @@ - tqlayout3 + layout3 @@ -29,7 +29,7 @@ - tqlayout1 + layout1 @@ -52,7 +52,7 @@ - tqlayout2 + layout2 @@ -76,7 +76,7 @@ Expanding - + 40 20 diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 273c5a4c..bd9e59ef 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -36,14 +36,14 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); - lePreview->tqsetAlignment(TQt::AlignCenter); + lePreview->setAlignment(TQt::AlignCenter); TQFont font; font.setPointSize(20); lePreview->setFont(font); lePreview->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); TQFontDatabase fdb; - TQStringList families = fdb.tqfamilies(); + TQStringList families = fdb.families(); for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) { if( (*it).contains('[') !=0 ) it = families.remove(it); @@ -52,20 +52,20 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF if( families.count() != 0 ) lbAvailable->insertStringList(families); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); pbAdd->setIconSet(iconSet); pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::tqfromLatin1("back")); + iconSet = SmallIconSet(TQString::fromLatin1("back")); pbRemove->setIconSet(iconSet); pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::tqfromLatin1("up")); + iconSet = SmallIconSet(TQString::fromLatin1("up")); pbMoveUp->setIconSet(iconSet); pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::tqfromLatin1("down")); + iconSet = SmallIconSet(TQString::fromLatin1("down")); pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index 86a109d9..7675741a 100644 --- a/quanta/components/csseditor/fontfamilychoosers.ui +++ b/quanta/components/csseditor/fontfamilychoosers.ui @@ -32,7 +32,7 @@ - tqlayout42 + layout42 @@ -40,7 +40,7 @@ - tqlayout40 + layout40 @@ -48,7 +48,7 @@ - tqlayout39 + layout39 @@ -56,7 +56,7 @@ - tqlayout36 + layout36 @@ -64,7 +64,7 @@ - tqlayout20 + layout20 @@ -87,7 +87,7 @@ - tqlayout15 + layout15 @@ -145,7 +145,7 @@ - tqlayout38 + layout38 @@ -164,7 +164,7 @@ Expanding - + 20 40 @@ -193,7 +193,7 @@ - + AlignCenter @@ -219,13 +219,13 @@ pbMoveUp - + 22 22 - + 22 22 @@ -239,13 +239,13 @@ pbAdd - + 22 22 - + 22 22 @@ -259,13 +259,13 @@ pbRemove - + 22 22 - + 22 22 @@ -279,13 +279,13 @@ pbMoveDown - + 22 22 - + 22 22 @@ -307,7 +307,7 @@ Expanding - + 20 40 @@ -318,7 +318,7 @@ - tqlayout6 + layout6 @@ -358,7 +358,7 @@ - tqlayout41 + layout41 @@ -374,7 +374,7 @@ Expanding - + 313 20 @@ -383,7 +383,7 @@ - tqlayout9 + layout9 diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index f1e1c101..922c7dbe 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -113,7 +113,7 @@ void propertySetter::addButton(){ m_pb = new KPushButton(this); TQToolTip::add(m_pb, i18n( "More..." )); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("2rightarrow")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("2rightarrow")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index b94bdbcd..c62cc7a7 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -42,7 +42,7 @@ StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("stylesheet")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_iconWidth = pixMap.width(); diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp index 0a573925..0b80caa2 100644 --- a/quanta/components/csseditor/stylesheetparser.cpp +++ b/quanta/components/csseditor/stylesheetparser.cpp @@ -164,11 +164,11 @@ void stylesheetParser::parseSelector(){ if (m_stylesheetStructure.contains(selectorName)) { uint i = 2; - TQString s = selectorName + TQString("-v%1").tqarg(i); + TQString s = selectorName + TQString("-v%1").arg(i); while (m_stylesheetStructure.contains(s)) { i++; - s = selectorName + TQString("-v%1").tqarg(i); + s = selectorName + TQString("-v%1").arg(i); } selectorName = s; } diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 7a35ee23..994876a3 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){ } void TLPEditor::setButtonIcon(TQString s){ - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1(s.ascii())); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s.ascii())); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); -- cgit v1.2.1