diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:42 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:06:42 -0600 |
| commit | 70a7a3094773362fb65043bdeb876375714f2547 (patch) | |
| tree | 1d9271cf7d2f086b484714f55a5f5c39a4da41bf | |
| parent | 6ee2a113c808e9fe2fa25ae6dc2ca7d6ca366015 (diff) | |
| download | k9copy-70a7a3094773362fb65043bdeb876375714f2547.tar.gz k9copy-70a7a3094773362fb65043bdeb876375714f2547.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
| -rw-r--r-- | src/k9copy.cpp | 6 | ||||
| -rw-r--r-- | src/k9main.cpp | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/k9copy.cpp b/src/k9copy.cpp index 030a1e1..8d0cc7a 100644 --- a/src/k9copy.cpp +++ b/src/k9copy.cpp @@ -155,7 +155,7 @@ void k9Copy::createCopyWindows() { setAutoSaveSettings(); KSimpleConfig settings("K9Copy"); if (settings.hasGroup("dock")) - dockManager->readConfig((KConfig*)&settings,"dock"); + dockManager->readConfig((TDEConfig*)&settings,"dock"); } void k9Copy::removeToolWindows() { @@ -224,7 +224,7 @@ void k9Copy::createImportWindows() { setAutoSaveSettings(); KSimpleConfig settings("K9Copy"); if (settings.hasGroup("dockImport")) - dockManager->readConfig((KConfig*)&settings,"dockImport"); + dockManager->readConfig((TDEConfig*)&settings,"dockImport"); m_k9Import->init(); @@ -485,7 +485,7 @@ void k9Copy::quit() { } void k9Copy::saveDock() { - KConfig config("K9Copy"); + TDEConfig config("K9Copy"); if (m_k9MainView) { dockManager->writeConfig(&config,"dock"); m_k9Main->saveSettings(); diff --git a/src/k9main.cpp b/src/k9main.cpp index 8818bc9..1035e34 100644 --- a/src/k9main.cpp +++ b/src/k9main.cpp @@ -502,16 +502,16 @@ TQString k9Main::getDevice(TQComboBox *_combo) #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) KURL url=KURL::fromPathOrURL(res); - //KIO::mount(true,0,res,"",true); - KIO::UDSEntry entry; + //TDEIO::mount(true,0,res,"",true); + TDEIO::UDSEntry entry; //first call to mount the device - KIO::NetAccess::stat(KURL::fromPathOrURL(res+"/."),entry,0); - if (KIO::NetAccess::stat(url,entry,0) ) + TDEIO::NetAccess::stat(KURL::fromPathOrURL(res+"/."),entry,0); + if (TDEIO::NetAccess::stat(url,entry,0) ) { - KIO::UDSEntry::iterator it; + TDEIO::UDSEntry::iterator it; for ( it = entry.begin(); it != entry.end(); ++it ) { - if ( (*it).m_uds== KIO::UDS_LOCAL_PATH) { + if ( (*it).m_uds== TDEIO::UDS_LOCAL_PATH) { res=(*it).m_str; } } @@ -1440,7 +1440,7 @@ long k9Main::getFreeSpace(const TQString & _path) connect(FreeSp,TQT_SIGNAL(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long )),this,TQT_SLOT(foundMountPoint (const TQString &, unsigned long , unsigned long , unsigned long ))); connect(FreeSp,TQT_SIGNAL(done ( )),this,TQT_SLOT(fspDone ())); - TQString mountPoint = KIO::findPathMountPoint( _path ); + TQString mountPoint = TDEIO::findPathMountPoint( _path ); FreeSp->readDF(mountPoint); do { |