summaryrefslogtreecommitdiffstats
path: root/drkonqi
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 04:10:07 +0000
commitfd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch)
tree9eda848e56fcb862fdfdf479adeccd95b6fe387a /drkonqi
parent02f67d0e1355b79b1806746efb0f2f640e57f13d (diff)
downloadtdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz
tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip
Revert automated changes
Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'drkonqi')
-rw-r--r--drkonqi/backtrace.cpp10
-rw-r--r--drkonqi/backtrace.h2
-rw-r--r--drkonqi/debugger.cpp12
-rw-r--r--drkonqi/krashconf.cpp26
-rw-r--r--drkonqi/toplevel.cpp8
5 files changed, 29 insertions, 29 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index f2f4688fa..c60d6a41c 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
{
// remove crap
if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
- m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
+ m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
if( m_krashconf->disableChecks())
return true;
@@ -146,13 +146,13 @@ bool BackTrace::usefulBacktrace()
// how many " ?? " in the bt ?
int unknown = 0;
if( !m_krashconf->invalidStackFrameRegExp().isEmpty())
- unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
+ unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
// how many stack frames in the bt ?
int frames = 0;
if( !m_krashconf->frameRegExp().isEmpty())
- frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
+ frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
else
- frames = strBt.tqcontains('\n');
+ frames = strBt.contains('\n');
bool tooShort = false;
if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
@@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
--len;
}
m_strBt.remove( pos, len );
- m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
+ m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
}
}
}
diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h
index 70c3a0994..b6779f3eb 100644
--- a/drkonqi/backtrace.h
+++ b/drkonqi/backtrace.h
@@ -49,7 +49,7 @@ signals:
void append(const TQString &str); // Just the new text
void someError();
- void done(const TQString &); // tqreplaces whole text
+ void done(const TQString &); // replaces whole text
protected slots:
void slotProcessExited(KProcess * proc);
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index b54a0f9ba..c6b073e4f 100644
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@@ -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->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
//m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
- KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
+ KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
m_copyButton = new KPushButton( item, w );
connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
m_copyButton->setEnabled( false );
@@ -82,7 +82,7 @@ void KrashDebugger :: slotDone(const TQString& str)
m_status->setText(i18n("Done."));
m_copyButton->setEnabled( true );
m_saveButton->setEnabled( true );
- m_backtrace->setText( m_prependText + str ); // tqreplace with possibly post-processed backtrace
+ m_backtrace->setText( m_prependText + str ); // replace with possibly post-processed backtrace
}
void KrashDebugger :: slotCopy()
@@ -109,8 +109,8 @@ void KrashDebugger :: slotSave()
}
else
{
- TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
- if( defname.tqcontains( '/' ))
+ TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
+ if( defname.contains( '/' ))
defname = defname.mid( defname.findRev( '/' ) + 1 );
TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
if (!filename.isEmpty())
@@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
bool KrashDebugger::performChecks( TQString* msg )
{
bool ret = true;
- KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
+ KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index ae22606f4..4faccc956 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::tqfromLatin1("enduser"));
+ TQString::fromLatin1("enduser"));
TQString debuggername = config->readEntry("Debugger",
- TQString::tqfromLatin1("gdb"));
+ TQString::fromLatin1("gdb"));
- KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
+ KConfig debuggers(TQString::fromLatin1("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::tqfromLatin1("presets/%1rc").arg(configname),
+ KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
true, false, "appdata");
preset.setGroup("ErrorDescription");
@@ -138,24 +138,24 @@ void KrashConfig :: readConfig()
TQString str = TQString::number(m_signalnum);
// use group unknown if signal not found
if (!preset.hasGroup(str))
- str = TQString::tqfromLatin1("unknown");
+ str = TQString::fromLatin1("unknown");
preset.setGroup(str);
m_signalName = preset.readEntry("Name");
if (b)
m_signalText = preset.readEntry("Comment");
}
-// tqreplace some of the strings
+// replace some of the strings
void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
{
TQMap<TQString,TQString> map;
- map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
- map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : 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;
+ map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
+ map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : 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;
if (shell)
str = KMacroExpander::expandMacrosShellQuote( str, map );
else
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index ff18d2488..488edaebd 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::tqfromLatin1("pics/konqi.png")));
+ TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
lab->setPixmap(pix);
- lab->setFixedSize( lab->tqsizeHint() );
+ lab->setFixedSize( lab->sizeHint() );
TQLabel * info = new TQLabel(generateText(), page);
- info->setMinimumSize(info->tqsizeHint());
+ info->setMinimumSize(info->sizeHint());
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::tqfromLatin1
+ TQString buf = TQString::fromLatin1
("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
m_bugreport->setText(buf);