diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:17:58 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:17:58 -0600 |
commit | 14b1eb042ec8a3f40a9f00a48c702ebfcd77d92b (patch) | |
tree | 5db3d7a27c0bc93bf0213459b13af97c34899c16 /kipi-plugins/acquireimages | |
parent | 00c3041bcca175069e36271b72188965ad1ffcf5 (diff) | |
download | kipi-plugins-14b1eb042ec8a3f40a9f00a48c702ebfcd77d92b.tar.gz kipi-plugins-14b1eb042ec8a3f40a9f00a48c702ebfcd77d92b.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/acquireimages')
-rw-r--r-- | kipi-plugins/acquireimages/acquireimagedialog.cpp | 10 | ||||
-rw-r--r-- | kipi-plugins/acquireimages/acquireimagedialog.h | 4 | ||||
-rw-r--r-- | kipi-plugins/acquireimages/screenshotdialog.cpp | 4 | ||||
-rw-r--r-- | kipi-plugins/acquireimages/screenshotdialog.h | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp index 5068bc4..cac0997 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.cpp +++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp @@ -147,7 +147,7 @@ void AcquireImageDialog::readSettings(void) { // Read all settings from configuration file. - m_config = new KConfig("kipirc"); + m_config = new TDEConfig("kipirc"); m_config->setGroup("AcquireImages Settings"); m_FileName->setText(m_config->readPathEntry("DefaultImageFileName", i18n("image"))); m_imageCompression->setValue(m_config->readNumEntry("ImageCompression", 75)); @@ -164,7 +164,7 @@ void AcquireImageDialog::writeSettings(void) { // Write all settings in configuration file. - m_config = new KConfig("kipirc"); + m_config = new TDEConfig("kipirc"); m_config->setGroup("AcquireImages Settings"); m_config->writePathEntry("DefaultImageFileName", m_FileName->text()); m_config->writeEntry("ImageCompression", m_imageCompression->value()); @@ -428,14 +428,14 @@ void AcquireImageDialog::slotOk() TQString ext = extension(imageFormat); url.setFileName(fileName + ext); - if (KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) + if (TDEIO::NetAccess::exists(url, false NETACCESS_WIDGET)) { for (int idx = 1; idx < 100 ; ++idx) { url.setFileName(TQString("%1_%2%3").arg(fileName).arg(idx).arg(ext)); kdDebug(51001) << "File already exist. Try to fixed target Url to: " << url.prettyURL() << endl; - if (!KIO::NetAccess::exists(url, false NETACCESS_WIDGET)) + if (!TDEIO::NetAccess::exists(url, false NETACCESS_WIDGET)) break; } } @@ -478,7 +478,7 @@ void AcquireImageDialog::slotOk() // Upload the image if necessary if ( !url.isLocalFile()) { - if (!KIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) + if (!TDEIO::NetAccess::upload(imagePath, url NETACCESS_WIDGET)) { KMessageBox::error(this, i18n("Could not upload image to \"%1\".").arg(url.prettyURL())); return; diff --git a/kipi-plugins/acquireimages/acquireimagedialog.h b/kipi-plugins/acquireimages/acquireimagedialog.h index e826058..990ff23 100644 --- a/kipi-plugins/acquireimages/acquireimagedialog.h +++ b/kipi-plugins/acquireimages/acquireimagedialog.h @@ -54,7 +54,7 @@ class TQFrame; class TQPushButton; class KListBox; -class KConfig; +class TDEConfig; class KIntNumInput; class KSqueezedTextLabel; @@ -86,7 +86,7 @@ private: TQPushButton *m_addNewAlbumButton; TQPushButton *m_helpButton; - KConfig *m_config; + TDEConfig *m_config; TQString m_newDir; TQString m_ImagesFilesSort; diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp index 91db602..3a4ec1c 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.cpp +++ b/kipi-plugins/acquireimages/screenshotdialog.cpp @@ -130,7 +130,7 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent // Read all settings from configuration file. - m_config = new KConfig("kipirc"); + m_config = new TDEConfig("kipirc"); m_config->setGroup("ScreenshotImages Settings"); if (m_config->readEntry("GrabDesktop", "true") == "true") @@ -181,7 +181,7 @@ void ScreenGrabDialog::slotClose( void ) { // Write all settings in configuration file. - m_config = new KConfig("kipirc"); + m_config = new TDEConfig("kipirc"); m_config->setGroup("ScreenshotImages Settings"); m_config->writeEntry("GrabDesktop", m_desktopCB->isChecked()); m_config->writeEntry("HideHostWin", m_hideCB->isChecked()); diff --git a/kipi-plugins/acquireimages/screenshotdialog.h b/kipi-plugins/acquireimages/screenshotdialog.h index 86c5d84..c737838 100644 --- a/kipi-plugins/acquireimages/screenshotdialog.h +++ b/kipi-plugins/acquireimages/screenshotdialog.h @@ -52,7 +52,7 @@ class TQWidget; class TQCheckBox; class TQPushButton; -class KConfig; +class TDEConfig; class KIntNumInput; namespace KIPIAcquireImagesPlugin @@ -98,7 +98,7 @@ private: TQImage m_screenshotImage; - KConfig *m_config; + TDEConfig *m_config; TQWidget *m_grabber; |