From 3c5631f74d1c75204f950140331e10f739082ee9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:33:36 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kview/modules/presenter/config/kviewpresenterconfig.cpp     | 2 +-
 kview/modules/presenter/config/kviewpresenterconfig.desktop | 2 +-
 kview/modules/presenter/config/kviewpresenterconfig.h       | 2 +-
 kview/modules/presenter/imagelistitem.cpp                   | 4 ++--
 kview/modules/presenter/kviewpresenter.cpp                  | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kview/modules')

diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index e44889ed..7ed447c2 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -32,7 +32,7 @@ typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFact
 K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactory( "kcm_kviewpresenterconfig" ) )
 
 KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args )
-	: KCModule( KViewPresenterConfigFactory::instance(), parent, args )
+	: TDECModule( KViewPresenterConfigFactory::instance(), parent, args )
 {
 	TQBoxLayout * layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() );
 	layout->setAutoAdd( true );
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.desktop b/kview/modules/presenter/config/kviewpresenterconfig.desktop
index e57ea16a..f71b6bdd 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.desktop
+++ b/kview/modules/presenter/config/kviewpresenterconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kpresenter
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewpresenterconfig
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h
index f21b5778..3bc7457b 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.h
+++ b/kview/modules/presenter/config/kviewpresenterconfig.h
@@ -23,7 +23,7 @@
 
 class TQCheckBox;
 
-class KViewPresenterConfig : public KCModule
+class KViewPresenterConfig : public TDECModule
 {
 	Q_OBJECT
   
diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp
index 441568ad..313cd75b 100644
--- a/kview/modules/presenter/imagelistitem.cpp
+++ b/kview/modules/presenter/imagelistitem.cpp
@@ -48,7 +48,7 @@ ImageListItem::ImageListItem( KListView * parent, const KURL & url )
 		m_pTempFile = new KTempFile( TQString(), extension );
 		m_filename = m_pTempFile->name();
 
-		m_pJob = KIO::get( m_url, m_pExtension->urlArgs().reload, false );
+		m_pJob = TDEIO::get( m_url, m_pExtension->urlArgs().reload, false );
 		*/
 	}
 }
@@ -58,7 +58,7 @@ ImageListItem::~ImageListItem()
 	if( ! m_url.isLocalFile() )
 	{
 		// remove downloaded tempfile
-		//KIO::NetAccess::removeTempFile( m_filename );
+		//TDEIO::NetAccess::removeTempFile( m_filename );
 	}
 }
 
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 7335f1af..534b305c 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -410,7 +410,7 @@ void KViewPresenter::loadList()
 		return;
 
 	TQString tempfile;
-	if( ! KIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) )
+	if( ! TDEIO::NetAccess::download( url, tempfile, m_pViewer->widget() ) )
 	{
 		KMessageBox::error( m_pImageList, i18n( "Could not load\n%1" ).arg( url.prettyURL() ) );
 		return;
@@ -446,7 +446,7 @@ void KViewPresenter::loadList()
 		}
 		file.close();
 	}
-	KIO::NetAccess::removeTempFile( tempfile );
+	TDEIO::NetAccess::removeTempFile( tempfile );
 }
 
 void KViewPresenter::saveList()
@@ -482,8 +482,8 @@ void KViewPresenter::saveList()
 
 		if( ! url.isLocalFile() )
 		{
-			KIO::NetAccess::upload( tempfile, url, m_pViewer->widget() );
-			KIO::NetAccess::removeTempFile( tempfile );
+			TDEIO::NetAccess::upload( tempfile, url, m_pViewer->widget() );
+			TDEIO::NetAccess::removeTempFile( tempfile );
 		}
 	}
 }
-- 
cgit v1.2.3