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

pull/1/head
Timothy Pearson 10 years ago
parent 6ee2a113c8
commit 70a7a30947

@ -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();

@ -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
{

Loading…
Cancel
Save