diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:28:11 -0600 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-04 03:25:46 +0200 |
commit | 0669339d48f65fc18388faefe54b239591d4705f (patch) | |
tree | 6ef46442916496544051ff920549b71024548581 /kate | |
parent | be503a6af9e8a650410f5e3446c1c4ee338adaf4 (diff) | |
download | tdeaddons-0669339d48f65fc18388faefe54b239591d4705f.tar.gz tdeaddons-0669339d48f65fc18388faefe54b239591d4705f.zip |
Rename old tq methods that no longer need a unique name
(cherry picked from commit b88830e9111dc4375bc1461c3f7b3e7b3e73f733)
Diffstat (limited to 'kate')
-rw-r--r-- | kate/filelistloader/katefll_initplugin.cpp | 2 | ||||
-rw-r--r-- | kate/insertcommand/plugin_kateinsertcommand.cpp | 2 | ||||
-rw-r--r-- | kate/kpybrowser/kpybrowser.cpp | 2 | ||||
-rw-r--r-- | kate/make/plugin_katemake.cpp | 24 | ||||
-rw-r--r-- | kate/snippets/CWidgetSnippetsBase.ui | 2 | ||||
-rw-r--r-- | kate/snippets/plugin_katesnippets.cpp | 2 | ||||
-rw-r--r-- | kate/xmltools/plugin_katexmltools.cpp | 2 |
7 files changed, 18 insertions, 18 deletions
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"<<endl; diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index 813b36a..f88f0ba 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -352,7 +352,7 @@ WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) setMainWidget( page ); TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() ); - KAnimWidget *aw = new KAnimWidget( TQString::tqfromLatin1("kde"), 48, page ); + KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page ); lo->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("<qt>"); + TQString msg = TQString::fromLatin1("<qt>"); if (isError()) { - msg.append(TQString::tqfromLatin1("<font color=\"red\">")); + msg.append(TQString::fromLatin1("<font color=\"red\">")); } msg.append(message()); if (isError()) { - msg.append(TQString::tqfromLatin1("</font>")); + msg.append(TQString::fromLatin1("</font>")); } - msg.append(TQString::tqfromLatin1("<qt>")); + msg.append(TQString::fromLatin1("<qt>")); 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 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> 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("<mark/>"), sSelection ); - sText.replace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) ); + sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) ); sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) ); kv->insertText ( sText ); } diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index ce53476..734c257 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -468,7 +468,7 @@ void PluginKateXMLTools::getDTD() "as a document of type \"%1\". The meta DTD for this document type " "will now be loaded.").tqarg( doctype ), i18n( "Loading XML Meta DTD" ), - TQString::tqfromLatin1( "DTDAssigned") ); + TQString::fromLatin1( "DTDAssigned") ); } if( url.isEmpty() ) |