diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:26:01 -0600 |
commit | 7251ddd58d498d631dc56bc00849f61cb4acdabd (patch) | |
tree | 135cf378aaee8e8f2eeff5ae5c6732ed465e5b5a /src/kvpncconfig.cpp | |
parent | e6af9bb1ecd39082b6abc1f559d4e3e735259bde (diff) | |
download | kvpnc-7251ddd58d498d631dc56bc00849f61cb4acdabd.tar.gz kvpnc-7251ddd58d498d631dc56bc00849f61cb4acdabd.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/kvpncconfig.cpp')
-rw-r--r-- | src/kvpncconfig.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp index 46c10ea..702d876 100644 --- a/src/kvpncconfig.cpp +++ b/src/kvpncconfig.cpp @@ -165,7 +165,7 @@ KVpncConfig::KVpncConfig(TQWidget *parent,KStatusBar *statusbar) SuccessLogColor=TQt::darkGreen; DebugLogColor=TQt::yellow; - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); logfileName = TQString(dirs->saveLocation( "data" )); TQString logfilePath = TQString(logfileName + "/kvpnc/kvpnc.log"); logfile.setName( logfilePath ); @@ -193,7 +193,7 @@ void KVpncConfig::appendLogEntry( TQString msg, LogType type ) { if ( !logfile.isOpen() ) { - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString logfileName = dirs->saveLocation( "data" ); logfileName += "/kvpnc/kvpnc.log"; // /root.kde/share/apps/kvpnc.log // KMessageBox::information( this, logfileName, "info" ); @@ -322,7 +322,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile) { if (saveOneProfile && Profile.isEmpty()) return; - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString filePath = dirs->findResource ( "config", "kvpncrc" ); TQFile::remove ( filePath ); @@ -1006,7 +1006,7 @@ void KVpncConfig::loadOptions() if ( writeLogFile ) if ( !logfile.isOpen() ) { - KStandardDirs *dirs = KGlobal::dirs(); + KStandardDirs *dirs = TDEGlobal::dirs(); TQDir AppFolder (TQString(dirs->saveLocation( "data" )+"/kvpnc")); if (!AppFolder.exists()) @@ -1448,7 +1448,7 @@ void KVpncConfig::loadOptions() if ( oldConfigurationFound ) { // delete configuration file - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString filePath = dirs->findResource ( "config", "kvpncrc" ); TQFile::remove ( filePath ); @@ -4286,7 +4286,7 @@ TQString KVpncConfig::removeWhiteSpaceAtBegin(const TQString str) void KVpncConfig::doBackupConfig() { - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc"); TQFile OriginalConfFile( config ); TQFile backupOriginalConfFile( config+".backup" ); @@ -4306,7 +4306,7 @@ void KVpncConfig::doBackupConfig() void KVpncConfig::restoreBackupConfig() { - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString config = TQString(dirs->saveLocation( "config" )+"/kvpncrc"); TQFile OriginalConfFile( config+".backup" ); TQFile backupOriginalConfFile( config ); @@ -4339,7 +4339,7 @@ void KVpncConfig::getToolsInfo() void KVpncConfig::removeEntry(TQString Name) { - KStandardDirs * dirs = KGlobal::dirs(); + KStandardDirs * dirs = TDEGlobal::dirs(); TQString filePath = dirs->findResource ( "config", "kvpncrc" ); appPointer->processEvents(); |