From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- drkonqi/backtrace.cpp | 2 +- drkonqi/debugger.cpp | 10 +++++----- drkonqi/krashconf.cpp | 24 ++++++++++++------------ drkonqi/toplevel.cpp | 8 ++++---- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'drkonqi') diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index e82ed614e..a89e63584 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -175,7 +175,7 @@ void BackTrace::processBacktrace() --len; } m_strBt.remove( pos, len ); - m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" )); + m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" )); } } } diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 11e9339dd..d90fc38d3 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************/ -#include +#include #include #include @@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, TQWidget *w = new TQWidget( this ); ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); m_status = new TQLabel( w ); - m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); //m_copyButton = new KPushButton( KStdGuiItem::copy(), w ); - KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) ); + KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) ); m_copyButton = new KPushButton( item, w ); connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); @@ -109,7 +109,7 @@ void KrashDebugger :: slotSave() } else { - TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); + TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" ); if( defname.contains( '/' )) defname = defname.mid( defname.findRev( '/' ) + 1 ); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); @@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger() bool KrashDebugger::performChecks( TQString* msg ) { bool ret = true; - KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); + KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true ); kdedcfg.setGroup( "General" ); if( kdedcfg.readBoolEntry( "DelayedCheck", false )) { diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index c99f9b09c..e3a525174 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -93,12 +93,12 @@ void KrashConfig :: readConfig() // maybe we should check if it's relative? TQString configname = config->readEntry("ConfigName", - TQString::fromLatin1("enduser")); + TQString::tqfromLatin1("enduser")); TQString debuggername = config->readEntry("Debugger", - TQString::fromLatin1("gdb")); + TQString::tqfromLatin1("gdb")); - KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername), + KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername), true, false, "appdata"); debuggers.setGroup("General"); @@ -112,7 +112,7 @@ void KrashConfig :: readConfig() m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_kcrashRegExp = debuggers.readEntry("KCrashRegExp"); - KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), + KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname), true, false, "appdata"); preset.setGroup("ErrorDescription"); @@ -138,7 +138,7 @@ void KrashConfig :: readConfig() TQString str = TQString::number(m_signalnum); // use group unknown if signal not found if (!preset.hasGroup(str)) - str = TQString::fromLatin1("unknown"); + str = TQString::tqfromLatin1("unknown"); preset.setGroup(str); m_signalName = preset.readEntry("Name"); if (b) @@ -149,13 +149,13 @@ void KrashConfig :: readConfig() void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const { TQMap map; - map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName()); - map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("tdeinit") : m_execname; - map[TQString::fromLatin1("signum")] = TQString::number(signalNumber()); - map[TQString::fromLatin1("signame")] = signalName(); - map[TQString::fromLatin1("progname")] = programName(); - map[TQString::fromLatin1("pid")] = TQString::number(pid()); - map[TQString::fromLatin1("tempfile")] = tempFile; + map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); + map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("tdeinit") : m_execname; + map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber()); + map[TQString::tqfromLatin1("signame")] = signalName(); + map[TQString::tqfromLatin1("progname")] = programName(); + map[TQString::tqfromLatin1("pid")] = TQString::number(pid()); + map[TQString::tqfromLatin1("tempfile")] = tempFile; if (shell) str = KMacroExpander::expandMacrosShellQuote( str, map ); else diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index ab804281f..118e56c39 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) // picture of konqi TQLabel *lab = new TQLabel(page); lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png"))); + TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png"))); lab->setPixmap(pix); - lab->setFixedSize( lab->sizeHint() ); + lab->setFixedSize( lab->tqsizeHint() ); TQLabel * info = new TQLabel(generateText(), page); - info->setMinimumSize(info->sizeHint()); + info->setMinimumSize(info->tqsizeHint()); if (m_krashconf->showBacktrace()) { @@ -196,7 +196,7 @@ void Toplevel :: slotUser3() void Toplevel :: slotBacktraceDone(const TQString &str) { // Do not translate.. This will be included in the _MAIL_. - TQString buf = TQString::fromLatin1 + TQString buf = TQString::tqfromLatin1 ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str; m_bugreport->setText(buf); -- cgit v1.2.1