Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent ffb2c736f2
commit 6062981203

@ -157,8 +157,8 @@ BatchProgressDialog::BatchProgressDialog( TQWidget *parent, const TQString &capt
layout->setStretchFactor( labelTitle, 1 ); layout->setStretchFactor( labelTitle, 1 );
TQString dir; TQString dir;
KGlobal::dirs()->addResourceType("kipi_banner_left", KGlobal::dirs()->kde_default("data") + "kipi/data"); TDEGlobal::dirs()->addResourceType("kipi_banner_left", TDEGlobal::dirs()->kde_default("data") + "kipi/data");
dir = KGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png"); dir = TDEGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png");
pixmapLabelLeft->setPaletteBackgroundColor( TQColor(201, 208, 255) ); pixmapLabelLeft->setPaletteBackgroundColor( TQColor(201, 208, 255) );
pixmapLabelLeft->setPixmap( TQPixmap( dir + "banner_left.png" ) ); pixmapLabelLeft->setPixmap( TQPixmap( dir + "banner_left.png" ) );

@ -315,7 +315,7 @@ void ImageCollectionSelector::slotSelectionChanged(TQListViewItem* listItem)
{ {
TQDate date(imcollItem->imageCollection().date()); TQDate date(imcollItem->imageCollection().date());
text += cellBeg + i18n("Date:") + text += cellBeg + i18n("Date:") +
cellMid + KGlobal::locale()->formatDate(date) + cellMid + TDEGlobal::locale()->formatDate(date) +
cellEnd; cellEnd;
} }

@ -113,8 +113,8 @@ ImageDialog::ImageDialog(TQWidget* parent, KIPI::Interface* interface,
dvlay->addWidget( headerFrame ); dvlay->addWidget( headerFrame );
TQString directory; TQString directory;
KGlobal::dirs()->addResourceType("kipi_banner_left", KGlobal::dirs()->kde_default("data") + "kipi/data"); TDEGlobal::dirs()->addResourceType("kipi_banner_left", TDEGlobal::dirs()->kde_default("data") + "kipi/data");
directory = KGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png"); directory = TDEGlobal::dirs()->findResourceDir("kipi_banner_left", "banner_left.png");
pixmapLabelLeft->setPaletteBackgroundColor( TQColor(201, 208, 255) ); pixmapLabelLeft->setPaletteBackgroundColor( TQColor(201, 208, 255) );
pixmapLabelLeft->setPixmap( TQPixmap( directory + "banner_left.png" ) ); pixmapLabelLeft->setPixmap( TQPixmap( directory + "banner_left.png" ) );

@ -205,7 +205,7 @@ PluginLoader::PluginLoader( const TQStringList& ignores, Interface* interface )
d->m_ignores = ignores; d->m_ignores = ignores;
KTrader::OfferList offers = KTrader::self()->query("KIPI/Plugin"); KTrader::OfferList offers = KTrader::self()->query("KIPI/Plugin");
KConfig* config = KGlobal::config(); KConfig* config = TDEGlobal::config();
config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) ); config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) );
KTrader::OfferList::ConstIterator iter; KTrader::OfferList::ConstIterator iter;
@ -359,7 +359,7 @@ ConfigWidget::~ConfigWidget()
void ConfigWidget::apply() void ConfigWidget::apply()
{ {
KConfig* config = KGlobal::config(); KConfig* config = TDEGlobal::config();
config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) ); config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) );
bool changes = false; bool changes = false;

Loading…
Cancel
Save