From c3b301575a98e4c3505ad95534d6192b65539dab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:36:08 -0600 Subject: Rename old tq methods that no longer need a unique name --- lib/util/blockingkprocess.cpp | 4 ++-- lib/util/filetemplate.cpp | 4 ++-- lib/util/settings.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/util') diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index 51845a5c..c0d1b106 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -68,12 +68,12 @@ bool BlockingKProcess::start(RunMode runmode, Communication comm) void BlockingKProcess::slotReceivedStdOut(KProcess *, char *buffer, int buflen) { - m_stdOut += TQString::tqfromLatin1(buffer, buflen); + m_stdOut += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotReceivedStdErr(KProcess *, char *buffer, int buflen) { - m_stdErr += TQString::tqfromLatin1(buffer, buflen); + m_stdErr += TQString::fromLatin1(buffer, buflen); } void BlockingKProcess::slotProcessExited(KProcess *) diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index e0425614..ac4b018c 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -69,8 +69,8 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & TQString email = DomUtil::readEntry(dom, "/general/email"); TQString version = DomUtil::readEntry(dom, "/general/version"); TQString appname = DomUtil::readEntry(dom, "/general/projectname"); - TQString date = TQDate::tqcurrentDate().toString(); - TQString year = TQString::number(TQDate::tqcurrentDate().year()); + TQString date = TQDate::currentDate().toString(); + TQString year = TQString::number(TQDate::currentDate().year()); TQString str = text; str.replace(TQRegExp("\\$EMAIL\\$"),email); diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp index f91c91f0..c9087942 100644 --- a/lib/util/settings.cpp +++ b/lib/util/settings.cpp @@ -23,12 +23,12 @@ TQString Settings::terminalEmulatorName( KConfig & config ) if ( useKDESetting ) { - KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); - terminal = confGroup.readEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + terminal = confGroup.readEntry("TerminalApplication", TQString::fromLatin1("konsole")); } else { - terminal = config.readEntry( "TerminalApplication", TQString::tqfromLatin1("konsole")); + terminal = config.readEntry( "TerminalApplication", TQString::fromLatin1("konsole")); } return terminal; } -- cgit v1.2.3