From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmobile/devices/gnokii/gnokii_mobile.cpp | 30 +++++++++++++++--------------- kmobile/devices/gnokii/gnokii_mobile.h | 4 ++-- kmobile/devices/skeleton/skeleton.cpp | 6 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'kmobile/devices') diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 1271d3ce7..95a014a6c 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -154,7 +154,7 @@ bool KMobileGnokii::setGnokiiStateMachine() return true; } -bool KMobileGnokii::saveConfig( KConfig &conf, TQString group ) +bool KMobileGnokii::saveConfig( TDEConfig &conf, TQString group ) { conf.setGroup(group); conf.writeEntry("model", m_modelnr ); @@ -170,7 +170,7 @@ bool KMobileGnokii::saveConfig( KConfig &conf, TQString group ) return true; } -bool KMobileGnokii::loadConfig( KConfig &conf, TQString group ) +bool KMobileGnokii::loadConfig( TDEConfig &conf, TQString group ) { conf.setGroup(group); m_modelnr = conf.readEntry("model", m_modelnr ); @@ -182,13 +182,13 @@ bool KMobileGnokii::loadConfig( KConfig &conf, TQString group ) bool KMobileGnokii::saveGnokiiConfiguration() { - KConfig conf( TQDir::homeDirPath() + "/.gnokiirc", false, false, "" ); + TDEConfig conf( TQDir::homeDirPath() + "/.gnokiirc", false, false, "" ); return saveConfig( conf, "global" ); } bool KMobileGnokii::loadGnokiiConfiguration() { - KConfig conf( TQDir::homeDirPath() + "/.gnokiirc", true, false, "" ); + TDEConfig conf( TQDir::homeDirPath() + "/.gnokiirc", true, false, "" ); return loadConfig( conf, "global" ); } @@ -341,19 +341,19 @@ static int gn_error2kio_error( gn_error err ) case GN_ERR_INVALIDMEMORYTYPE: case GN_ERR_INVALIDLOCATION: case GN_ERR_EMPTYLOCATION: - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; case GN_ERR_MEMORYFULL: - return KIO::ERR_OUT_OF_MEMORY; + return TDEIO::ERR_OUT_OF_MEMORY; case GN_ERR_NOLINK: - return KIO::ERR_COULD_NOT_CONNECT; + return TDEIO::ERR_COULD_NOT_CONNECT; case GN_ERR_TIMEOUT: - return KIO::ERR_SERVER_TIMEOUT; + return TDEIO::ERR_SERVER_TIMEOUT; case GN_ERR_ENTRYTOOLONG: case GN_ERR_WRONGDATAFORMAT: case GN_ERR_INVALIDSIZE: - return KIO::ERR_COULD_NOT_WRITE; + return TDEIO::ERR_COULD_NOT_WRITE; default: - return KIO::ERR_INTERNAL; + return TDEIO::ERR_INTERNAL; } } @@ -590,7 +590,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").arg(index); // index is zero-based, but in gnokii the first address starts at 1 if (index<0 || index>=numAddresses()) - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; // now get our addressbook entry @@ -610,7 +610,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) { /* XXX: this is a read-only device */ - return KIO::ERR_WRITE_ACCESS_DENIED; + return TDEIO::ERR_WRITE_ACCESS_DENIED; } @@ -683,7 +683,7 @@ int KMobileGnokii::numCalendarEntries() int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event ) { if (index < 0 || index >= GN_CALNOTE_MAX_NUMBER) - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; gn_data_clear(&data); gn_calnote entry; @@ -764,7 +764,7 @@ int KMobileGnokii::readCalendarEntry( int index, KCal::Event &event ) int KMobileGnokii::storeCalendarEntry( int index, const KCal::Event &event ) { if (index < 0 || index >= GN_CALNOTE_MAX_NUMBER) - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; gn_error error; gn_calnote entry; @@ -862,7 +862,7 @@ int KMobileGnokii::readNote( int index, TQString ¬e ) { // index is zero-based, and we only have one simulated note if (index<0 || index>=numNotes()) - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; note = TQString("NOTE #%1\n" "--------\n" diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 782c2b92d..fbcb3cb6a 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -77,8 +77,8 @@ signals: protected: bool setGnokiiStateMachine(); - bool saveConfig( KConfig &conf, TQString group ); - bool loadConfig( KConfig &conf, TQString group ); + bool saveConfig( TDEConfig &conf, TQString group ); + bool loadConfig( TDEConfig &conf, TQString group ); bool saveGnokiiConfiguration(); bool loadGnokiiConfiguration(); bool saveDeviceConfiguration(); diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index 5c05f3d9e..3a7c77b07 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -109,7 +109,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) { // index is zero-based if (index<0 || index>=numAddresses()) - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; // now build our own sample name addr.setFamilyName(TQString("Meyer_%1").arg(index+1)); @@ -133,7 +133,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool ) { /* this is a read-only device */ - return KIO::ERR_WRITE_ACCESS_DENIED; + return TDEIO::ERR_WRITE_ACCESS_DENIED; } /* @@ -148,7 +148,7 @@ int KMobileSkeleton::readNote( int index, TQString ¬e ) { // index is zero-based, and we only have one simulated note if (index<0 || index>=numNotes()) - return KIO::ERR_DOES_NOT_EXIST; + return TDEIO::ERR_DOES_NOT_EXIST; note = TQString("NOTE #%1\n" "--------\n" -- cgit v1.2.1