diff options
Diffstat (limited to 'kkbswitch/kbpickicondlg.cpp')
| -rw-r--r-- | kkbswitch/kbpickicondlg.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kkbswitch/kbpickicondlg.cpp b/kkbswitch/kbpickicondlg.cpp index c4dc299..b3821ef 100644 --- a/kkbswitch/kbpickicondlg.cpp +++ b/kkbswitch/kbpickicondlg.cpp @@ -23,16 +23,16 @@ #include <ntqpushbutton.h> #include <ntqimage.h> -#include <kdeversion.h> -#include <klocale.h> -#if KDE_VERSION_MAJOR >= 3 +#include <tdeversion.h> +#include <tdelocale.h> +#if TDE_VERSION_MAJOR >= 3 #include <kstandarddirs.h> #else #include <kstddirs.h> #endif -#include <kglobal.h> -#include <kfiledialog.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdefiledialog.h> +#include <tdemessagebox.h> #include "kbconfig.h" #include "pathlistboxitem.h" @@ -42,7 +42,7 @@ KBPickIconDlg::KBPickIconDlg(const TQString ¤tPath, const TQPixmap ¤ : KDialogBase(parent, name, true /*modal*/, i18n("Pick an icon") /*caption*/, Ok | Cancel) { TQVBox *page = makeVBoxMainWidget(); - lbIcons = new KListBox(page); + lbIcons = new TDEListBox(page); TQObject::connect(lbIcons, SIGNAL(doubleClicked(TQListBoxItem*)), this, SLOT(slotOk())); TQObject::connect(lbIcons, SIGNAL(returnPressed(TQListBoxItem*)), @@ -133,7 +133,7 @@ void KBPickIconDlg::loadCountryFlags() TQDir dir; TQStringList locales; TQString path; - TQStringList dirs = KGlobal::dirs()->findDirs("locale", "l10n"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("locale", "l10n"); for (TQStringList::Iterator dirIter = dirs.begin(); dirIter != dirs.end(); dirIter++) { dir.setPath(*dirIter); @@ -141,7 +141,7 @@ void KBPickIconDlg::loadCountryFlags() for (TQStringList::Iterator iter = locales.begin(); iter != locales.end(); iter++) { path = dir.path() + "/" + *iter + "/flag.png"; if (*iter != "." && *iter != ".." && pix.load(path)) { - KConfig config(dir.path() + "/" + *iter + "/entry.desktop", true, false, + TDEConfig config(dir.path() + "/" + *iter + "/entry.desktop", true, false, "locale" /*doesn't really matter*/); config.setGroup("KCM Locale"); new PathListBoxItem(lbIcons, pix, config.readEntry("Name"), path); @@ -166,7 +166,7 @@ void KBPickIconDlg::loadGkbCountryFlags() path = info->filePath(); code = info->baseName(); if (img.load(path)) { - KConfig config("l10n/" + code + "/entry.desktop", true, false, "locale"); + TDEConfig config("l10n/" + code + "/entry.desktop", true, false, "locale"); config.setGroup("KCM Locale"); name = config.readEntry("Name"); if (!name.isNull()) { |