summaryrefslogtreecommitdiffstats
path: root/kcontrol/krdb
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kcontrol/krdb
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/krdb')
-rw-r--r--kcontrol/krdb/krdb.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index ccb906301..582937b8c 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::fromLatin1(sysGtkrc(version)));
+ list.append(TQString::tqfromLatin1(sysGtkrc(version)));
list.append(TQDir::homeDirPath()+userGtkrc(version));
}
list.remove(gtkkde);
@@ -174,10 +174,10 @@ 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.contains( '.' ) > 1 )
- qversion.truncate( qversion.findRev( '.' ) );
- if ( qversion.contains( '-' ) )
- qversion.truncate( qversion.findRev( '-' ) );
+ if ( qversion.tqcontains( '.' ) > 1 )
+ qversion.truncate( qversion.tqfindRev( '.' ) );
+ if ( qversion.tqcontains( '-' ) )
+ qversion.truncate( qversion.tqfindRev( '-' ) );
TQStringList kdeAdded =
settings.readListEntry("/qt/KDE/kdeAddedLibraryPaths");
@@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
pathDb[path]=true;
- if(path.contains("/lib64/"))
- path.replace("/lib64/","/lib/");
+ if(path.tqcontains("/lib64/"))
+ path.tqreplace("/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::currentDateTime().toString());
+ "#\n").arg(TQDateTime::tqcurrentDateTime().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::currentDateTime();
+ TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime();
static Atom qt_settings_timestamp = 0;
if (!qt_settings_timestamp) {