diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:11:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:11:54 -0600 |
| commit | 05c532196dc376204995110244d1585fb701880c (patch) | |
| tree | c3b22cb00cca156e0db5409264c3e6b7fb3ddc8a | |
| parent | e725f676cd3f476bc79efb1c085cc5ce0c677c61 (diff) | |
| download | kpowersave-05c532196dc376204995110244d1585fb701880c.tar.gz kpowersave-05c532196dc376204995110244d1585fb701880c.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | src/configuredialog.cpp | 6 | ||||
| -rw-r--r-- | src/screen.cpp | 4 | ||||
| -rw-r--r-- | src/settings.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp index ea9522d..48251e8 100644 --- a/src/configuredialog.cpp +++ b/src/configuredialog.cpp @@ -237,7 +237,7 @@ void ConfigureDialog::setIcons(){ pB_editAutosuspendGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic)); pB_editAutodimmGBlacklist->setIconSet(SmallIconSet("configure", TQIconSet::Automatic)); - tB_scheme->setItemIconSet( 0 ,SmallIcon("kscreensaver", TQIconSet::Automatic)); + tB_scheme->setItemIconSet( 0 ,SmallIcon("tdescreensaver", TQIconSet::Automatic)); tB_scheme->setItemIconSet( 1 ,SmallIcon("display", TQIconSet::Automatic)); if(actions[0] == "Suspend to Disk") @@ -669,7 +669,7 @@ void ConfigureDialog::setGeneralSettings() { } if (lockmethod == "automatic") comboB_lock->setCurrentItem(0); - else if (lockmethod == "kscreensaver") comboB_lock->setCurrentItem(1); + else if (lockmethod == "tdescreensaver") comboB_lock->setCurrentItem(1); else if (lockmethod == "xscreensaver") comboB_lock->setCurrentItem(2); else if (lockmethod == "xlock") comboB_lock->setCurrentItem(3); else if (gnome_session && (lockmethod == "gnomescreensaver")) comboB_lock->setCurrentItem(4); @@ -832,7 +832,7 @@ void ConfigureDialog::saveGeneralSettings() { TQString selected_method = ""; int _selected = comboB_lock->currentItem(); if(_selected == 0) selected_method = "automatic"; - else if(_selected == 1) selected_method = "kscreensaver"; + else if(_selected == 1) selected_method = "tdescreensaver"; else if(_selected == 2) selected_method = "xscreensaver"; else if(_selected == 3) selected_method = "xlock"; else if(gnome_session && (_selected == 4)) selected_method = "gnomescreensaver"; diff --git a/src/screen.cpp b/src/screen.cpp index 16cca85..092c4bd 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -479,7 +479,7 @@ xscreensaver: } return status; } - // set lock for xlock --> no kscreensaver, no xscreensaver present and + // set lock for xlock --> no tdescreensaver, no xscreensaver present and // the check for gnome screensaver is not finished. This should normaly // not happen, but in this case we use xlock else if(SCREENSAVER_STATUS == 10 || SCREENSAVER_STATUS == 99){ @@ -551,7 +551,7 @@ bool screen::lockScreen( TQString lock_withMethod ) { // screensaver status known? SCREENSAVER_STATUS = checkScreenSaverStatus(); - if (lock_withMethod == "kscreensaver") { + if (lock_withMethod == "tdescreensaver") { if((SCREENSAVER_STATUS == 1) || (SCREENSAVER_STATUS == 0)){ DCOPReply reply = screen_save_dcop_ref.call("lock"); if ( reply.isValid() ) { diff --git a/src/settings.h b/src/settings.h index dd737e7..163ec66 100644 --- a/src/settings.h +++ b/src/settings.h @@ -145,8 +145,8 @@ public: //! the name of the lock method /*! * This TQString contains a alias to the selected method for lock screen. Possible values: - * \li automatic for automatically selected (sequence: kscreensaver, xscreensaver, xlock) - * \li kscreensaver for KDE KScreensaver + * \li automatic for automatically selected (sequence: tdescreensaver, xscreensaver, xlock) + * \li tdescreensaver for KDE KScreensaver * \li xscreensaver for XScreensaver (default used on GNOME) * \li xlock for xlock */ |