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

---
 src/app/mainwindow.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/app/mainwindow.cpp')

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);
-- 
cgit v1.2.1