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

---
 quanta/project/projectupload.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'quanta/project/projectupload.cpp')

diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index f38cf937..1f389cb4 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -158,7 +158,7 @@ void ProjectUpload::slotBuildTree()
 {
  emit eventHappened("upload_requested", m_project->projectBaseURL().url(), "");
  loadRemoteUploadInfo();
- KIO::UDSEntry entry;
+ TDEIO::UDSEntry entry;
  TQString strUrl = QuantaCommon::qUrl(startUrl);
  bool isDirectory = strUrl.endsWith("/");
  bool forceUpload = !startUrl.isEmpty();
@@ -209,7 +209,7 @@ void ProjectUpload::slotBuildTree()
        int uploadedTime = -1;
        if (m_uploadTimeList.contains(s))
          uploadedTime = m_uploadTimeList[s];
-       int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME);
+       int modifiedTime = item.time(TDEIO::UDS_MODIFICATION_TIME);
        el.setAttribute("modified_time", modifiedTime);
        int uploadStatus = el.attribute("uploadstatus", "1").toInt();
        if (m_quickUpload || (forceUpload && uploadStatus == 0))
@@ -454,14 +454,14 @@ void ProjectUpload::upload()
   if (!from.fileName(false).isEmpty() && fileItem)
   {
     emit eventHappened("before_upload", from.url(), to.url());
-    KIO::FileCopyJob *job = KIO::file_copy( from, to, fileItem->permissions(), true, false, false );
+    TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false );
 
-    connect( job, TQT_SIGNAL( result( KIO::Job * ) ),this,
-                      TQT_SLOT( uploadFinished( KIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( percent( KIO::Job *,unsigned long ) ),
-                this, TQT_SLOT( uploadProgress( KIO::Job *,unsigned long ) ) );
-    connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ),
-                this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) );
+    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this,
+                      TQT_SLOT( uploadFinished( TDEIO::Job * ) ) );
+    connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ),
+                this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) );
+    connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ),
+                this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) );
 
     labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName()));
     currentProgress->setProgress( 0 );
@@ -477,7 +477,7 @@ void ProjectUpload::upload()
   reject();
 }
 
-void ProjectUpload::uploadFinished( KIO::Job *job )
+void ProjectUpload::uploadFinished( TDEIO::Job *job )
 {
    if ( !job ) return;
 
@@ -489,18 +489,18 @@ void ProjectUpload::uploadFinished( KIO::Job *job )
       saveRemoteUploadInfo();
       return;
    }
-   KIO::FileCopyJob *fJob = dynamic_cast<KIO::FileCopyJob *>(job);
+   TDEIO::FileCopyJob *fJob = dynamic_cast<TDEIO::FileCopyJob *>(job);
    if (fJob)
     emit eventHappened("after_upload", fJob->srcURL().url(), fJob->destURL().url());
    slotUploadNext();
 }
 
-void ProjectUpload::uploadProgress ( KIO::Job *, unsigned long percent  )
+void ProjectUpload::uploadProgress ( TDEIO::Job *, unsigned long percent  )
 {
   currentProgress->setProgress( percent );
 }
 
-void ProjectUpload::uploadMessage ( KIO::Job *, const TQString & msg )
+void ProjectUpload::uploadMessage ( TDEIO::Job *, const TQString & msg )
 {
     labelCurFile->setText( currentURL.fileName() + " : " + msg );
 }
-- 
cgit v1.2.1