Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent 6062981203
commit 3f41170967
  1. 2
      libkipi/libkipi/imagecollectionselector.cpp
  2. 4
      libkipi/libkipi/imagedialog.cpp
  3. 4
      libkipi/libkipi/pluginloader.cpp
  4. 8
      libkipi/libkipi/uploadwidget.cpp
  5. 2
      libkipi/libkipi/uploadwidget.h

@ -265,7 +265,7 @@ void ImageCollectionSelector::slotSelectionChanged(TQListViewItem* listItem)
KURL::List images(imcollItem->imageCollection().images());
if (!images.isEmpty())
{
KIO::PreviewJob* thumbJob = KIO::filePreview(images.first(), 128);
TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(images.first(), 128);
connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
}

@ -245,7 +245,7 @@ void ImageDialog::slotImageSelected(TQListViewItem* item) {
d->_url=static_cast<ImageLVI*>(item)->_url;
d->_preview->clear();
KIO::PreviewJob* thumbJob = KIO::filePreview(d->_url, PREVIEW_SIZE);
TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
}
@ -283,7 +283,7 @@ void ImageDialog::slotImagesSelected()
{
d->_url = d->_urls.first();
KIO::PreviewJob* thumbJob = KIO::filePreview(d->_url, PREVIEW_SIZE);
TDEIO::PreviewJob* thumbJob = TDEIO::filePreview(d->_url, PREVIEW_SIZE);
connect( thumbJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
TQT_SLOT(slotGotPreview(const KFileItem* , const TQPixmap&)));
}

@ -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 = TDEGlobal::config();
TDEConfig* config = TDEGlobal::config();
config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) );
KTrader::OfferList::ConstIterator iter;
@ -359,7 +359,7 @@ ConfigWidget::~ConfigWidget()
void ConfigWidget::apply()
{
KConfig* config = TDEGlobal::config();
TDEConfig* config = TDEGlobal::config();
config->setGroup( TQString::fromLatin1( "KIPI/EnabledPlugin" ) );
bool changes = false;

@ -187,13 +187,13 @@ void KIPI::UploadWidget::mkdir()
KURL url = path();
url.addPath( dir );
KIO::SimpleJob* job = KIO::mkdir(url);
TDEIO::SimpleJob* job = TDEIO::mkdir(url);
connect(job, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(slotAlbumCreated(KIO::Job*)));
connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(slotAlbumCreated(TDEIO::Job*)));
}
void KIPI::UploadWidget::slotAlbumCreated(KIO::Job* job)
void KIPI::UploadWidget::slotAlbumCreated(TDEIO::Job* job)
{
int code = job->error();

@ -60,7 +60,7 @@ namespace KIPI
protected slots:
void load();
void slotAlbumCreated(KIO::Job* job);
void slotAlbumCreated(TDEIO::Job* job);
void slotFolderSelected(TQListViewItem *);
private slots:

Loading…
Cancel
Save