From b88830e9111dc4375bc1461c3f7b3e7b3e73f733 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:28:11 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name --- atlantikdesigner/designer/designer.cpp | 4 +- atlantikdesigner/designer/group.cpp | 14 +++---- atlantikdesigner/designer/group.h | 2 +- .../xxports/gmx/gmx_xxport.cpp | 12 +++--- kate/filelistloader/katefll_initplugin.cpp | 2 +- .../plugin_kateinsertcommand.cpp | 2 +- kate/kpybrowser/kpybrowser.cpp | 2 +- kate/make/plugin_katemake.cpp | 24 +++++------ kate/snippets/CWidgetSnippetsBase.ui | 2 +- kate/snippets/plugin_katesnippets.cpp | 2 +- kate/xmltools/plugin_katexmltools.cpp | 2 +- kicker-applets/kbinaryclock/kbinaryclock.cpp | 10 ++--- kicker-applets/kbinaryclock/settings.ui | 22 +++++----- kicker-applets/kolourpicker/simplebutton.cpp | 12 +++--- kicker-applets/kolourpicker/simplebutton.h | 6 +-- kicker-applets/ktimemon/timemon.cc | 8 ++-- kicker-applets/math/mathapplet.cpp | 10 ++--- .../mediacontrol/amarokInterface.cpp | 4 +- kicker-applets/mediacontrol/amarokInterface.h | 2 +- kicker-applets/mediacontrol/jukInterface.cpp | 4 +- kicker-applets/mediacontrol/jukInterface.h | 2 +- kicker-applets/mediacontrol/kscdInterface.cpp | 4 +- kicker-applets/mediacontrol/kscdInterface.h | 2 +- kicker-applets/mediacontrol/mediacontrol.cpp | 20 +++++----- kicker-applets/mediacontrol/mediacontrol.h | 2 +- .../mediacontrol/mediacontrolconfigwidget.ui | 24 +++++------ kicker-applets/mediacontrol/mpdInterface.cpp | 30 +++++++------- kicker-applets/mediacontrol/mpdInterface.h | 2 +- .../mediacontrol/noatunInterface.cpp | 4 +- kicker-applets/mediacontrol/noatunInterface.h | 2 +- kicker-applets/mediacontrol/playerInterface.h | 4 +- kicker-applets/mediacontrol/simplebutton.cpp | 12 +++--- kicker-applets/mediacontrol/simplebutton.h | 6 +-- kicker-applets/mediacontrol/xmmsInterface.cpp | 4 +- kicker-applets/mediacontrol/xmmsInterface.h | 2 +- konq-plugins/adblock/adblock.cpp | 2 +- konq-plugins/akregator/konqfeedicon.cpp | 2 +- .../domtreeviewer/attributeeditdialog.ui | 2 +- konq-plugins/domtreeviewer/domtreeviewbase.ui | 8 ++-- konq-plugins/domtreeviewer/domtreewindow.cpp | 2 +- .../domtreeviewer/elementeditdialog.ui | 2 +- konq-plugins/domtreeviewer/messagedialog.ui | 2 +- konq-plugins/domtreeviewer/texteditdialog.ui | 2 +- konq-plugins/fsview/inode.cpp | 2 +- konq-plugins/fsview/treemap.cpp | 40 +++++++++---------- konq-plugins/fsview/treemap.h | 2 +- konq-plugins/imagerotation/exif.py | 2 +- .../kimgalleryplugin/imgalleryplugin.cpp | 16 ++++---- konq-plugins/kuick/kcmkuick/kcmkuickdialog.ui | 4 +- konq-plugins/microformat/konqmficon.cpp | 2 +- konq-plugins/minitools/minitoolsplugin.cpp | 4 +- konq-plugins/searchbar/searchbar.cpp | 6 +-- .../sidebar/mediaplayer/mediawidget_skel.ui | 20 +++++----- .../mediaplayer/mediawidget_skel_designer.ui | 20 +++++----- .../sidebar/metabar/src/configdialog.cpp | 22 +++++----- .../sidebar/metabar/src/defaultplugin.cpp | 4 +- .../sidebar/metabar/src/httpplugin.cpp | 2 +- .../sidebar/metabar/src/metabarwidget.cpp | 12 +++--- .../sidebar/metabar/src/protocolplugin.cpp | 2 +- .../sidebar/newsticker/norsswidget.cpp | 2 +- konq-plugins/sidebar/newsticker/nspanel.cpp | 2 +- .../sidebar/newsticker/nsstacktabwidget.cpp | 2 +- konq-plugins/uachanger/uachangerplugin.cpp | 2 +- ksig/ksig.cpp | 4 +- ksig/ksig.h | 2 +- ksig/standardtextbase.ui | 2 +- noatun-plugins/alarm/wakeup.cpp | 4 +- noatun-plugins/alsaplayer/AlsaPlayer.ui | 6 +-- noatun-plugins/alsaplayer/userinterface.cpp | 2 +- noatun-plugins/dub/dub/fileselectorwidget.cpp | 4 +- noatun-plugins/lyrics/cmodule.cpp | 2 +- noatun-plugins/lyrics/lyrics.cpp | 2 +- noatun-plugins/nexscope/nex.h | 2 +- noatun-plugins/oblique/view.cpp | 2 +- noatun-plugins/pitchablespeed/speedtuner.ui | 2 +- noatun-plugins/tippercanoe/synaescope.cpp | 2 +- noatun-plugins/wavecapture/wavecapture.h | 4 +- renamedlgplugins/audio/audiopreview.cpp | 2 +- renamedlgplugins/images/imagevisualizer.cpp | 2 +- 79 files changed, 250 insertions(+), 250 deletions(-) diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 3f39fb6..9f05f61 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -76,10 +76,10 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) KConfig *config = kapp->config(); config->setGroup("General"); - TQColor defaultColor = tqcolorGroup().background(); + TQColor defaultColor = colorGroup().background(); defaultBg = config->readColorEntry("alternateBackground", &defaultColor); config->setGroup("WM"); - defaultColor = tqcolorGroup().dark(); + defaultColor = colorGroup().dark(); defaultFg = config->readColorEntry("activeBackground", &defaultColor); // these must match up to the ones in editor.cpp! diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index b3da81f..679a4ac 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -38,16 +38,16 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint()); - tqcolorGroupBox = new TQVGroupBox(i18n("&Colors"), page); - vtqlayout->addWidget(tqcolorGroupBox); + colorGroupBox = new TQVGroupBox(i18n("&Colors"), page); + vtqlayout->addWidget(colorGroupBox); - (void) new TQLabel(i18n("Foreground:"), tqcolorGroupBox); - fgButton = new KColorButton(tqcolorGroupBox, "Foreground Button"); + (void) new TQLabel(i18n("Foreground:"), colorGroupBox); + fgButton = new KColorButton(colorGroupBox, "Foreground Button"); connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(fgChanged(const TQColor &))); connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); - (void) new TQLabel(i18n("Background:"), tqcolorGroupBox); - bgButton = new KColorButton(tqcolorGroupBox, "Background Button"); + (void) new TQLabel(i18n("Background:"), colorGroupBox); + bgButton = new KColorButton(colorGroupBox, "Background Button"); connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(bgChanged(const TQColor &))); connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed())); @@ -233,7 +233,7 @@ void GroupEditor::slotOk() void GroupEditor::selectionChanged() { bool issel = groups->currentItem() >= 0; - tqcolorGroupBox->setEnabled(issel); + colorGroupBox->setEnabled(issel); pricesGroupBox->setEnabled(issel); dynamicGroupBox->setEnabled(issel); removeB->setEnabled(issel); diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index 606189b..87086f0 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -86,7 +86,7 @@ class GroupEditor : public KDialogBase TQWidget *mathWidget; TQSpinBox *housePrice; TQSpinBox *globalPrice; - TQVGroupBox *tqcolorGroupBox; + TQVGroupBox *colorGroupBox; TQVGroupBox *pricesGroupBox; TQVGroupBox *dynamicGroupBox; KPushButton *removeB; diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index c5909c4..ea3ab6e 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -122,7 +122,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const if (checkDateTime(strList[5],dt)) addr->setBirthday(dt); addr->setNote(strList[6]); if (checkDateTime(strList[7],dt)) addr->setRevision(dt); - // addr->settqStatus(strList[8]); tqStatus + // addr->setStatus(strList[8]); Status // addr->xxx(strList[9]); Address_link_id // addr->setCategory(strList[10]); Categories addrMap[strList[0]] = addr; @@ -137,7 +137,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const return addrList; } // Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile,Mobile_type,Email, - // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,tqStatus + // Homepage,Position,Comments,Record_type_id,Record_type,Company,Department,Change_date,Preferred,Status line = gmxStream.readLine(); line = gmxStream.readLine(); @@ -181,7 +181,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const "KADDRESSBOOK", "X-Department", strList[17]); // Department if (checkDateTime(strList[18],dt)) addr->setRevision(dt); // Change_date // strList[19]=Preferred (see above) - // strList[20]=tqStatus (should always be "1") + // strList[20]=Status (should always be "1") addr->insertAddress(adr); } else { kdWarning() << "unresolved line: " << line << endl; @@ -243,7 +243,7 @@ bool GMXXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& static const TQString dateString( const TQDateTime &dt ) { if (!dt.isValid()) - return TQString::tqfromLatin1("1000-01-01 00:00:00"); + return TQString::fromLatin1("1000-01-01 00:00:00"); TQString d(dt.toString(Qt::ISODate)); d[10] = ' '; // remove the "T" in the middle of the string return d; @@ -281,7 +281,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << dateString(addr->birthday()) << DELIM // Birthday << addr->note() /*.replace('\n',"\r\n")*/ << DELIM // Comments << dateString(addr->revision()) << DELIM // Change_date - << "1##0\n"; // tqStatus, Address_link_id, Categories + << "1##0\n"; // Status, Address_link_id, Categories } t << "####\n"; @@ -333,7 +333,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) << ((record_id==0)?addr->custom("KADDRESSBOOK", "X-Department"):TQString()) << DELIM // Department << dateString(addr->revision()) << DELIM // Change_date << 5 << DELIM // Preferred - << 1 << endl; // tqStatus (should always be "1") + << 1 << endl; // Status (should always be "1") } ++no; diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 882ff70..b98c308 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -83,7 +83,7 @@ int InitPluginKateFileListLoader::initKate() updateInit(); disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit())); -/* int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) ); +/* int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) ); if ( id != -1 ) { kdDebug()<<"Action slot was found, it will be called now"<addWidget(aw); TQLabel *l = new TQLabel( text, page ); lo->addWidget( l ); diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index 3ee96e5..34c9167 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) str = ""; return; } - r = tqitemRect (item); + r = itemRect (item); //r.setY(r.y() + 10); PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index bda41f5..8b116f1 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -82,7 +82,7 @@ void PluginKateMake::addView(Kate::MainWindow *win) Kate::ToolViewManager *viewmanager = win->toolViewManager(); TQWidget *w = viewmanager->createToolView("kate_plugin_make", Kate::ToolViewManager::Bottom, - SmallIcon(TQString::tqfromLatin1("misc")), + SmallIcon(TQString::fromLatin1("misc")), i18n("Make Output")); PluginKateMakeView *view = new PluginKateMakeView (w,win, "katemakeview"); @@ -132,7 +132,7 @@ public: (lineno > 0 ? TQString::number(lineno) : TQString()), message) { - m_isError = !message.contains(TQString::tqfromLatin1("warning")); + m_isError = !message.contains(TQString::fromLatin1("warning")); m_lineno = lineno; m_serial = s_serial++; } @@ -192,22 +192,22 @@ protected: TQString ErrorMessage::caption() const { - return TQString::tqfromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); + return TQString::fromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line()); } TQString ErrorMessage::fancyMessage() const { - TQString msg = TQString::tqfromLatin1(""); + TQString msg = TQString::fromLatin1(""); if (isError()) { - msg.append(TQString::tqfromLatin1("")); + msg.append(TQString::fromLatin1("")); } msg.append(message()); if (isError()) { - msg.append(TQString::tqfromLatin1("")); + msg.append(TQString::fromLatin1("")); } - msg.append(TQString::tqfromLatin1("")); + msg.append(TQString::fromLatin1("")); return msg; } @@ -350,7 +350,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, actionCollection(), "make_settings" ); setInstance(new KInstance("kate")); - setXMLFile(TQString::tqfromLatin1("plugins/katemake/ui.rc")); + setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc")); setFocusPolicy(TQ_NoFocus); @@ -379,7 +379,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent, // if (source_prefix.isEmpty()) { filenameDetector = new TQRegExp( - TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } // else { @@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item) << globalPos.x() << "," << globalPos.y() << endl; #if 0 KPassivePopup::message( - TQString::tqfromLatin1("%1:%2").tqarg(filename).tqarg(lineno), + TQString::fromLatin1("%1:%2").tqarg(filename).tqarg(lineno), msg, this); #else @@ -649,7 +649,7 @@ bool PluginKateMakeView::slotValidate() } document_dir = TQFileInfo(url.path()).dirPath(true) + - TQString::tqfromLatin1("/"); + TQString::fromLatin1("/"); if (document_dir.startsWith(source_prefix)) { @@ -717,7 +717,7 @@ void PluginKateMakeView::slotConfigure() if (!filenameDetector) { filenameDetector = new TQRegExp( - TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); + TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:")); } } //else diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui index 37c2aab..19d0170 100644 --- a/kate/snippets/CWidgetSnippetsBase.ui +++ b/kate/snippets/CWidgetSnippetsBase.ui @@ -156,7 +156,7 @@ Expanding - + 200 20 diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 649b45d..8212f47 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -171,7 +171,7 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem * item) { } sText.replace( TQRegExp(""), sSelection ); - sText.replace( TQRegExp(""), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); + sText.replace( TQRegExp(""), TQDate::currentDate().toString(Qt::LocalDate) ); sText.replace( TQRegExp("