diff options
author | Timothy Pearson <[email protected]> | 2013-01-31 13:20:19 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-31 13:20:19 -0600 |
commit | fc0196cdf6062125e587fbba536e78ea1f2d7f91 (patch) | |
tree | f896cfee60d61f50594e55c59c65c0e27920d118 | |
parent | 7a50d8810a790c1b936a6e61e0a10c8bb62bec51 (diff) | |
download | kpilot-fc0196cdf6062125e587fbba536e78ea1f2d7f91.tar.gz kpilot-fc0196cdf6062125e587fbba536e78ea1f2d7f91.zip |
Rename KStandard for enhanced compatibility with KDE4
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | kpilot/hotSync.cc | 2 | ||||
-rw-r--r-- | lib/kpilotdevicelink.cc | 2 | ||||
-rw-r--r-- | lib/plugin.cc | 6 |
4 files changed, 7 insertions, 7 deletions
@@ -944,8 +944,8 @@ TODO: only re-write a local database if it is changed. * Added isArchived() and makeArchived() methods to PilotAppCategory to set the dlpRecArchived flag. * Changed the way how the DBBackup/username/ and conduits/username/ - directories are created (now I'm using KStandardDirs::makeDir and - KStandardDirs::exists). + directories are created (now I'm using TDEStandardDirs::makeDir and + TDEStandardDirs::exists). * FirstSync now also means PC->HH or HH->PC directions (which is clear intuitively, as with these direction, nothing that's on the other side should matter at all). diff --git a/kpilot/hotSync.cc b/kpilot/hotSync.cc index 49e0182..b93a421 100644 --- a/kpilot/hotSync.cc +++ b/kpilot/hotSync.cc @@ -311,7 +311,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir ) DEBUGKPILOT << fname << ": Creating directory " << backupDir << endl; - KStandardDirs::makeDir( backupDir ); + TDEStandardDirs::makeDir( backupDir ); fi = TQFileInfo(backupDir); diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc index bd751c2..54fa84a 100644 --- a/lib/kpilotdevicelink.cc +++ b/lib/kpilotdevicelink.cc @@ -234,7 +234,7 @@ bool DeviceCommThread::open(const TQString &device) fTempSocket = (-1); link()->fRealPilotPath - = KStandardDirs::realFilePath(device.isEmpty() ? link()->fPilotPath : device); + = TDEStandardDirs::realFilePath(device.isEmpty() ? link()->fPilotPath : device); if ( !DeviceMap::self()->canBind(link()->fRealPilotPath) ) { diff --git a/lib/plugin.cc b/lib/plugin.cc index ed2ff90..715d29e 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -386,13 +386,13 @@ bool ConduitAction::openDatabases(const TQString &name, bool *retrieved) TQFileInfo fi(dbpath); TQString path(TQFileInfo(dbpath).dir(true).absPath()); if (!path.endsWith(CSL1("/"))) path.append(CSL1("/")); - if (!KStandardDirs::exists(path)) + if (!TDEStandardDirs::exists(path)) { DEBUGKPILOT << fname << ": Trying to create path for database: <" << path << ">" << endl; - KStandardDirs::makeDir(path); + TDEStandardDirs::makeDir(path); } - if (!KStandardDirs::exists(path)) + if (!TDEStandardDirs::exists(path)) { DEBUGKPILOT << fname << ": Database directory does not exist." << endl; if (retrieved) *retrieved = false; |