From ca82971624269719d487c6f7980d7237f9420036 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:00 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kate/make/plugin_katemake.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'kate/make') diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index bda41f5..1cb4064 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -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").arg(text(COL_FILE)).arg(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").arg(filename).arg(lineno), msg, this); #else @@ -644,12 +644,12 @@ bool PluginKateMakeView::slotValidate() KMessageBox::sorry(0, i18n("The file %1 is not a local file. " "Non-local files cannot be compiled.") - .tqarg(url.path())); + .arg(url.path())); return false; } document_dir = TQFileInfo(url.path()).dirPath(true) + - TQString::tqfromLatin1("/"); + TQString::fromLatin1("/"); if (document_dir.startsWith(source_prefix)) { @@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate() make = KStandardDirs::findExe("make"); *m_proc << make; if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) { - KMessageBox::error(0, i18n("Error: Failed to run %1.").tqarg(make.isEmpty() ? + KMessageBox::error(0, i18n("Error: Failed to run %1.").arg(make.isEmpty() ? "make" : make)); return false; } @@ -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 -- cgit v1.2.1