diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:27:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:27:15 -0600 |
| commit | 5b6d393e0a2c88cce8f433607c091ae883ef54f9 (patch) | |
| tree | 3c54f3e4a9d6fc2ac30a58e96c19ea878fa08459 /src/configdialog.cpp | |
| parent | eb52f16dcfba98b043537ea3da6a1b08b8d51b19 (diff) | |
| download | tellico-5b6d393e0a2c88cce8f433607c091ae883ef54f9.tar.gz tellico-5b6d393e0a2c88cce8f433607c091ae883ef54f9.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/configdialog.cpp')
| -rw-r--r-- | src/configdialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 993fd80..c5bdfac 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -281,7 +281,7 @@ void ConfigDialog::setupGeneralPage() { void ConfigDialog::setupPrintingPage() { // SuSE changed the icon name on me TQPixmap pix; - KIconLoader* loader = KGlobal::iconLoader(); + KIconLoader* loader = TDEGlobal::iconLoader(); if(loader) { pix = loader->loadIcon(TQString::fromLatin1("printer1"), KIcon::Desktop, KIcon::SizeMedium, KIcon::DefaultState, 0, true /*canReturnNull */); @@ -696,7 +696,7 @@ void ConfigDialog::saveConfiguration() { } m_removedConfigWidgets.clear(); - KConfig* masterConfig = KGlobal::config(); + KConfig* masterConfig = TDEGlobal::config(); bool reloadFetchers = false; int count = 0; // start group numbering at 0 @@ -990,7 +990,7 @@ void ConfigDialog::slotShowTemplatePreview() { } void ConfigDialog::loadTemplateList() { - TQStringList files = KGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("entry-templates/*.xsl"), + TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("entry-templates/*.xsl"), false, true); KSortableValueList<TQString, TQString> templates; for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { |