From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: 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 --- kcontrol/krdb/krdb.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'kcontrol/krdb') diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 6cd4cc2d0..ccb906301 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version) TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(TQString::tqfromLatin1(sysGtkrc(version))); + list.append(TQString::fromLatin1(sysGtkrc(version))); list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); @@ -174,9 +174,9 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = qVersion(); - if ( qversion.tqcontains( '.' ) > 1 ) + if ( qversion.contains( '.' ) > 1 ) qversion.truncate( qversion.findRev( '.' ) ); - if ( qversion.tqcontains( '-' ) ) + if ( qversion.contains( '-' ) ) qversion.truncate( qversion.findRev( '-' ) ); TQStringList kdeAdded = @@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) pathDb[path]=true; - if(path.tqcontains("/lib64/")) - path.tqreplace("/lib64/","/lib/"); + if(path.contains("/lib64/")) + path.replace("/lib64/","/lib/"); pathDb[path]=true; } @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(TQDateTime::tqcurrentDateTime().toString()); + "#\n").arg(TQDateTime::currentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -590,7 +590,7 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime(); + TQDateTime settingsstamp = TQDateTime::currentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { -- cgit v1.2.1