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

5 files changed, 24 insertions, 24 deletions

diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index d2a442c..f482cc7 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "configdialog.moc"
 namespace Gwenview {
 
-typedef TQValueList<KConfigDialogManager*> ConfigManagerList;
+typedef TQValueList<TDEConfigDialogManager*> ConfigManagerList;
 
 class ConfigDialogPrivate {
 public:
@@ -122,23 +122,23 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
 	// Create dialog pages
 	d->mImageListPage = addConfigPage<ConfigImageListPage>(
 		this, i18n("Configure Image List"), i18n("Image List"), "view_icon");
-	d->mManagers << new KConfigDialogManager(d->mImageListPage, FileViewConfig::self());
+	d->mManagers << new TDEConfigDialogManager(d->mImageListPage, FileViewConfig::self());
 	
 	d->mImageViewPage = addConfigPage<ConfigImageViewPage>(
 		this, i18n("Configure Image View"), i18n("Image View"), "looknfeel");
-	d->mManagers << new KConfigDialogManager(d->mImageViewPage, ImageViewConfig::self());
+	d->mManagers << new TDEConfigDialogManager(d->mImageViewPage, ImageViewConfig::self());
 	
 	d->mFullScreenPage = addConfigPage<ConfigFullScreenPage>(
 		this, i18n("Configure Full Screen Mode"), i18n("Full Screen"), "window_fullscreen");
-	d->mManagers << new KConfigDialogManager(d->mFullScreenPage, FullScreenConfig::self());
+	d->mManagers << new TDEConfigDialogManager(d->mFullScreenPage, FullScreenConfig::self());
 
 	d->mFileOperationsPage = addConfigPage<ConfigFileOperationsPage>(
 		this, i18n("Configure File Operations"), i18n("File Operations"), "folder");
-	d->mManagers << new KConfigDialogManager(d->mFileOperationsPage, FileOperationConfig::self());
+	d->mManagers << new TDEConfigDialogManager(d->mFileOperationsPage, FileOperationConfig::self());
 
 	d->mSlideShowPage = addConfigPage<ConfigSlideshowPage>(
 		this, i18n("SlideShow"), i18n("SlideShow"), "slideshow_play");
-	d->mManagers << new KConfigDialogManager(d->mSlideShowPage, SlideShowConfig::self());
+	d->mManagers << new TDEConfigDialogManager(d->mSlideShowPage, SlideShowConfig::self());
 
 #ifdef GV_HAVE_KIPI
 	Q_ASSERT(pluginLoader);
@@ -152,7 +152,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
 
 	d->mMiscPage = addConfigPage<ConfigMiscPage>(
 		this, i18n("Miscellaneous Settings"), i18n("Misc"), "gear");
-	d->mManagers << new KConfigDialogManager(d->mMiscPage, MiscConfig::self());
+	d->mManagers << new TDEConfigDialogManager(d->mMiscPage, MiscConfig::self());
 	// Read config, because the modified behavior might have changed
 	MiscConfig::self()->readConfig();
 
@@ -247,7 +247,7 @@ void ConfigDialog::calculateCacheSize() {
 	KURL url;
 	url.setPath(ThumbnailLoadJob::thumbnailBaseDir());
 	unsigned long size=KDirSize::dirSize(url);
-	KMessageBox::information( this,i18n("Cache size is %1").arg(KIO::convertSize(size)) );
+	KMessageBox::information( this,i18n("Cache size is %1").arg(TDEIO::convertSize(size)) );
 }
 
 
@@ -289,13 +289,13 @@ void ConfigDialog::emptyCache() {
 
 	KURL url;
 	url.setPath(dir);
-	if (KIO::NetAccess::del(url, topLevelWidget()) ) {
+	if (TDEIO::NetAccess::del(url, topLevelWidget()) ) {
 		KMessageBox::information( this,i18n("Cache emptied.") );
 	}
 }
 
 
-void ConfigDialog::onCacheEmptied(KIO::Job* job) {
+void ConfigDialog::onCacheEmptied(TDEIO::Job* job) {
 	if ( job->error() ) {
 		job->showErrorDialog(this);
 		return;
diff --git a/src/app/configdialog.h b/src/app/configdialog.h
index 5e35bcb..28b094d 100644
--- a/src/app/configdialog.h
+++ b/src/app/configdialog.h
@@ -53,7 +53,7 @@ private slots:
 	void updateOSDPreview();
 	void calculateCacheSize();
 	void emptyCache();
-	void onCacheEmptied(KIO::Job*);
+	void onCacheEmptied(TDEIO::Job*);
 
 private:
 	ConfigDialogPrivate* d;
diff --git a/src/app/dirviewcontroller.h b/src/app/dirviewcontroller.h
index 7dd31bd..1327b69 100644
--- a/src/app/dirviewcontroller.h
+++ b/src/app/dirviewcontroller.h
@@ -31,7 +31,7 @@ class TQWidget;
 class KListView;
 class KURL;
 
-namespace KIO {
+namespace TDEIO {
 class Job;
 }
 
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 485a946..75a9d42 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -143,17 +143,17 @@ static bool urlIsDirectory(TQWidget* parent, const KURL& url) {
 	if( url.filename( false ).isEmpty()) return true; // file:/somewhere/<nothing here>
 	// Do direct stat instead of using KIO if the file is local (faster)
 	if( url.isLocalFile()
-		&& !KIO::probably_slow_mounted( url.path())) {
+		&& !TDEIO::probably_slow_mounted( url.path())) {
 		KDE_struct_stat buff;
 		if ( KDE_stat( TQFile::encodeName(url.path()), &buff ) == 0 )  {
 			return S_ISDIR( buff.st_mode );
 		}
 	}
-	KIO::UDSEntry entry;
-	if( KIO::NetAccess::stat( url, entry, parent)) {
-		KIO::UDSEntry::ConstIterator it;
+	TDEIO::UDSEntry entry;
+	if( TDEIO::NetAccess::stat( url, entry, parent)) {
+		TDEIO::UDSEntry::ConstIterator it;
 		for(it=entry.begin();it!=entry.end();++it) {
-			if ((*it).m_uds==KIO::UDS_FILE_TYPE) {
+			if ((*it).m_uds==TDEIO::UDS_FILE_TYPE) {
 				return S_ISDIR( (*it).m_long );
 			}
 		}
@@ -197,7 +197,7 @@ void MainWindow::setFullScreen(bool value) {
 bool MainWindow::queryClose() {
 	mDocument->saveBeforeClosing();
 
-	KConfig* config=TDEGlobal::config();
+	TDEConfig* config=TDEGlobal::config();
 
 	// Don't store dock layout if only the image dock is visible. This avoid
 	// saving layout when in "fullscreen" or "image only" mode.
@@ -211,7 +211,7 @@ bool MainWindow::queryClose() {
 		if (TQFile::exists(dir)) {
 			KURL url;
 			url.setPath(dir);
-			KIO::NetAccess::del(url, this);
+			TDEIO::NetAccess::del(url, this);
 		}
 	}
 	
@@ -223,11 +223,11 @@ bool MainWindow::queryClose() {
 	return true;
 }
 
-void MainWindow::saveProperties( KConfig* cfg ) {
+void MainWindow::saveProperties( TDEConfig* cfg ) {
 	cfg->writeEntry( CONFIG_SESSION_URL, mFileViewController->url().url());
 }
 
-void MainWindow::readProperties( KConfig* cfg ) {
+void MainWindow::readProperties( TDEConfig* cfg ) {
 	KURL url(cfg->readEntry(CONFIG_SESSION_URL));
 	openURL(url);
 }
@@ -856,7 +856,7 @@ void MainWindow::updateImageActions() {
  * actions are created in createObjectInteractions
  */
 void MainWindow::createWidgets() {
-	KConfig* config=TDEGlobal::config();
+	TDEConfig* config=TDEGlobal::config();
 
 	mCentralStack=new TQWidgetStack(this);
 	setCentralWidget(mCentralStack);
diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h
index c38fbca..a2dc4a0 100644
--- a/src/app/mainwindow.h
+++ b/src/app/mainwindow.h
@@ -75,8 +75,8 @@ public slots:
 
 protected:
 	bool queryClose();
-	virtual void saveProperties( KConfig* );
-	virtual void readProperties( KConfig* );
+	virtual void saveProperties( TDEConfig* );
+	virtual void readProperties( TDEConfig* );
 
 private:
 	TQWidgetStack* mCentralStack;