diff options
author | Timothy Pearson <[email protected]> | 2013-10-30 16:45:33 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-10-30 16:45:33 -0500 |
commit | 690b6e163ba9b4da03fcd2b4f133bb5631be437b (patch) | |
tree | f42c9ee09f5772414b9c0d2742d43cf1178974ff | |
parent | f181fbbb337a75257089e64afabd04dac2e1d466 (diff) | |
parent | b7ae7a99ad7779421197aba5854c9e560a0faa6d (diff) | |
download | gtk-qt-engine-690b6e163ba9b4da03fcd2b4f133bb5631be437b.tar.gz gtk-qt-engine-690b6e163ba9b4da03fcd2b4f133bb5631be437b.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/gtk-qt-engine
-rw-r--r-- | kcm_gtk/kcmgtk.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/kcm_gtk/kcmgtk.cpp b/kcm_gtk/kcmgtk.cpp index 9532bb2..28faded 100644 --- a/kcm_gtk/kcmgtk.cpp +++ b/kcm_gtk/kcmgtk.cpp @@ -234,13 +234,15 @@ void KcmGtk::getInstalledThemes() bool installed = false; widget->styleBox->clear(); - TQStringList otherStyles = themes.keys(); - if(!otherStyles.empty()) { - otherStyles.remove(otherStyles.find("Qt")); + if(!themes.empty()) { + TQStringList otherStyles = themes.keys(); + if(otherStyles.find("Qt")!=otherStyles.end()) { + otherStyles.remove(otherStyles.find("Qt")); + } installed = !otherStyles.empty(); - } - if(installed) { - widget->styleBox->insertStringList(otherStyles); + if(installed) { + widget->styleBox->insertStringList(otherStyles); + } } widget->styleKde->setEnabled(installed); widget->styleBox->setEnabled(installed); @@ -269,13 +271,15 @@ void KcmGtk::getInstalledThemes() bool gtk3installed = false; widget->styleBox3->clear(); - TQStringList otherGtk3Styles = gtk3Themes.keys(); - if(!otherGtk3Styles.empty()) { - otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); + if(!gtk3Themes.empty()) { + TQStringList otherGtk3Styles = gtk3Themes.keys(); + if(otherGtk3Styles.find("tdegtk")!=otherGtk3Styles.end()) { + otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); + } gtk3installed = !otherGtk3Styles.empty(); - } - if(gtk3installed) { - widget->styleBox3->insertStringList(otherGtk3Styles); + if(gtk3installed) { + widget->styleBox3->insertStringList(otherGtk3Styles); + } } widget->styleKde3->setEnabled(gtk3installed); widget->styleBox3->setEnabled(gtk3installed); |