From 60629812034daa0b3bc47e12e9c48c0ac08948a0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:30:44 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libkipi/libkipi/batchprogressdialog.cpp | 4 ++-- libkipi/libkipi/imagecollectionselector.cpp | 2 +- libkipi/libkipi/imagedialog.cpp | 4 ++-- libkipi/libkipi/pluginloader.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libkipi/libkipi/batchprogressdialog.cpp b/libkipi/libkipi/batchprogressdialog.cpp index 411149e..195d590 100644 --- a/libkipi/libkipi/batchprogressdialog.cpp +++ b/libkipi/libkipi/batchprogressdialog.cpp @@ -157,8 +157,8 @@ BatchProgressDialog::BatchProgressDialog( TQWidget *parent, const TQString &capt layout->setStretchFactor( labelTitle, 1 ); TQString dir; - KGlobal::dirs()->addResourceType("kipi_banner_left", KGlobal::dirs()->kde_default("data") + "kipi/data"); - dir = KGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png"); + TDEGlobal::dirs()->addResourceType("kipi_banner_left", TDEGlobal::dirs()->kde_default("data") + "kipi/data"); + dir = TDEGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png"); pixmapLabelLeft->setPaletteBackgroundColor( TQColor(201, 208, 255) ); pixmapLabelLeft->setPixmap( TQPixmap( dir + "banner_left.png" ) ); diff --git a/libkipi/libkipi/imagecollectionselector.cpp b/libkipi/libkipi/imagecollectionselector.cpp index 75a6169..7c98990 100644 --- a/libkipi/libkipi/imagecollectionselector.cpp +++ b/libkipi/libkipi/imagecollectionselector.cpp @@ -315,7 +315,7 @@ void ImageCollectionSelector::slotSelectionChanged(TQListViewItem* listItem) { TQDate date(imcollItem->imageCollection().date()); text += cellBeg + i18n("Date:") + - cellMid + KGlobal::locale()->formatDate(date) + + cellMid + TDEGlobal::locale()->formatDate(date) + cellEnd; } diff --git a/libkipi/libkipi/imagedialog.cpp b/libkipi/libkipi/imagedialog.cpp index 606648a..75009e1 100644 --- a/libkipi/libkipi/imagedialog.cpp +++ b/libkipi/libkipi/imagedialog.cpp @@ -113,8 +113,8 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface, dvlay->addWidget( headerFrame ); TQString directory; - KGlobal::dirs()->addResourceType("kipi_banner_left", KGlobal::dirs()->kde_default("data") + "kipi/data"); - directory = KGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png"); + TDEGlobal::dirs()->addResourceType("kipi_banner_left", TDEGlobal::dirs()->kde_default("data") + "kipi/data"); + directory = TDEGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png"); pixmapLabelLeft->setPaletteBackgroundColor( TQColor(201, 208, 255) ); pixmapLabelLeft->setPixmap( TQPixmap( directory + "banner_left.png" ) ); diff --git a/libkipi/libkipi/pluginloader.cpp b/libkipi/libkipi/pluginloader.cpp index 5a02456..ec8845d 100644 --- a/libkipi/libkipi/pluginloader.cpp +++ b/libkipi/libkipi/pluginloader.cpp @@ -205,7 +205,7 @@ PluginLoader::PluginLoader( const TQStringList& ignores, Interface* interface ) d->m_ignores = ignores; KTrader::OfferList offers = KTrader::self()->query("KIPI/Plugin"); - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) ); KTrader::OfferList::ConstIterator iter; @@ -359,7 +359,7 @@ ConfigWidget::~ConfigWidget() void ConfigWidget::apply() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) ); bool changes = false;