diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:11:57 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:11:57 -0600 |
commit | 966b30e320ea9f5f8fb25fb67ad2205aad3a2c26 (patch) | |
tree | c84ec681a10fbf2d8dc4f082b88c5335fd81cfbe /src/configuredialog.cpp | |
parent | d60d44d67fa75f6576e0d20f13c50721acbf89da (diff) | |
download | tdepowersave-966b30e320ea9f5f8fb25fb67ad2205aad3a2c26.tar.gz tdepowersave-966b30e320ea9f5f8fb25fb67ad2205aad3a2c26.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/configuredialog.cpp')
-rw-r--r-- | src/configuredialog.cpp | 6 |
1 files changed, 3 insertions, 3 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"; |