diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
| commit | 934db26c3f8efe148a5680c22f965ee10f818a61 (patch) | |
| tree | 4a47cbb3ef398d11fa9283b5afdcd0a8d84fad7c /src/kicondialog.cpp | |
| parent | a1fb52e00e362130a46b34570e53f2c1f322f373 (diff) | |
| download | basket-934db26c3f8efe148a5680c22f965ee10f818a61.tar.gz basket-934db26c3f8efe148a5680c22f965ee10f818a61.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/kicondialog.cpp')
| -rw-r--r-- | src/kicondialog.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kicondialog.cpp b/src/kicondialog.cpp index 295fdb4..a812e85 100644 --- a/src/kicondialog.cpp +++ b/src/kicondialog.cpp @@ -84,7 +84,7 @@ KIconDialog::KIconDialog(TQWidget *parent, const char*) : KDialogBase(parent, "IconDialog", true, i18n("Select Icon"), Ok|Cancel, Ok) { d = new KIconDialogPrivate; - mpLoader = KGlobal::iconLoader(); + mpLoader = TDEGlobal::iconLoader(); init(); resize(minimumSize()); } @@ -106,7 +106,7 @@ void KIconDialog::init() setCustomLocation(TQString()); // Initialize mFileList // Read configuration - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "KIconDialog"); d->recentMax = config->readNumEntry("RecentMax", 10); d->recentList = config->readPathListEntry("RecentIcons"); @@ -143,7 +143,7 @@ void KIconDialog::init() KIconDialog::~KIconDialog() { // Write configuration - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); KConfigGroupSaver saver(config, "KIconDialog"); config->writeEntry("RecentMax", d->recentMax, true, true); config->writePathEntry("RecentIcons", d->recentList, ',', true, true); @@ -277,7 +277,7 @@ void KIconDialog::setCustomLocation( const TQString& location ) if (location.isEmpty()) { - mFileList = KGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); + mFileList = TDEGlobal::dirs()->findAllResources("appicon", TQString::fromLatin1("*.png")); } else { mFileList = mpLoader->queryIconsByDir(location); } @@ -426,7 +426,7 @@ class KIconButton::KIconButtonPrivate KIconButton::KIconButton(TQWidget *parent, const char *name) : TQPushButton(parent, name) { - init( KGlobal::iconLoader() ); + init( TDEGlobal::iconLoader() ); } KIconButton::KIconButton(KIconLoader *loader, |