diff options
56 files changed, 242 insertions, 154 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 4d5ad07a..dba12e86 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -46,5 +46,20 @@ if( WITH_SLP ) endif( ) endif( ) +if( BUILD_KOPETE AND BUILD_KOPETE_PROTOCOL_SMS AND WITH_GSM ) + check_include_file_cxx( gsmlib/gsm_util.h HAVE_GSMLIB_GSM_UTIL_H ) + + if( HAVE_GSMLIB_GSM_UTIL_H ) + find_library( GSM_LIBRARY gsmme ) + endif( ) + + if( HAVE_GSMLIB_GSM_UTIL_H AND GSM_LIBRARY ) + set( HAVE_GSMLIB 1 ) + else( ) + tde_message_fatal( "gsmlib is required, but was not found on your system" ) + endif( ) +endif( ) + + check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO ) check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO ) diff --git a/config.h.cmake b/config.h.cmake index cdda60ff..5b310852 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -33,6 +33,9 @@ // kopete/plugins/nowlistening #cmakedefine HAVE_XMMS 1 +// kopete/protocols/sms +#cmakedefine HAVE_GSMLIB 1 + // kopete/plugins/webpresence #cmakedefine HAVE_XSLT 1 diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index ccc7f612..aeff9d43 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -56,7 +56,7 @@ #include <tdemessagebox.h> #include <kjanuswidget.h> #include <tdelistview.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include "sambashare.h" #include "sambafile.h" @@ -1267,7 +1267,7 @@ void KcmSambaConf::save() { // Base settings _smbconf = _interface->configUrlRq->url(); - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),false); config.writeEntry("SMBCONF",_smbconf); config.sync(); diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index e48e7f98..39425834 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -21,7 +21,7 @@ #include <tqprocess.h> #include <tqfileinfo.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdebug.h> #include <tqfileinfo.h> #include <tdeio/job.h> @@ -652,7 +652,7 @@ bool SambaFile::saveTo(const TQString & path) } -SambaConfigFile* SambaFile::getSambaConfigFile(KSimpleConfig* config) +SambaConfigFile* SambaFile::getSambaConfigFile(TDESimpleConfig* config) { TQStringList groups = config->groupList(); @@ -677,9 +677,9 @@ SambaConfigFile* SambaFile::getSambaConfigFile(KSimpleConfig* config) } -KSimpleConfig* SambaFile::getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & path) +TDESimpleConfig* SambaFile::getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & path) { - KSimpleConfig *config = new KSimpleConfig(path,false); + TDESimpleConfig *config = new TDESimpleConfig(path,false); TQDictIterator<SambaShare> it(*sambaConfig); diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.h b/filesharing/advanced/kcm_sambaconf/sambafile.h index 08597d01..0e7d5525 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.h +++ b/filesharing/advanced/kcm_sambaconf/sambafile.h @@ -29,7 +29,7 @@ #include "sambashare.h" -class KSimpleConfig; +class TDESimpleConfig; class TDEProcess; class TDEConfig; class KTempFile; @@ -149,8 +149,8 @@ protected: int _sambaVersion; void parseParmStdOutput(); - SambaConfigFile* getSambaConfigFile(KSimpleConfig* config); - KSimpleConfig* getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & filename); + SambaConfigFile* getSambaConfigFile(TDESimpleConfig* config); + TDESimpleConfig* getSimpleConfig(SambaConfigFile* sambaConfig, const TQString & filename); diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 532b7298..6cb95a50 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -37,7 +37,7 @@ #include <ksambashare.h> #include <tdefileshare.h> #include <tdestandarddirs.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <kuser.h> @@ -196,7 +196,7 @@ void KFileShareConfig::allowedUsersBtnClicked() { void KFileShareConfig::load() { - KSimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); + TDESimpleConfig config(TQString::fromLatin1(FILESHARECONF),true); m_ccgui->shareGrp->setChecked( config.readEntry("FILESHARING", "yes") == "yes" ); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index b02bbaa4..b8681729 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <tdeglobal.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> diff --git a/kget/transfer.cpp b/kget/transfer.cpp index d8a853d7..8781409c 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -29,7 +29,7 @@ #include <kurl.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeaction.h> #include <kiconloader.h> #include <tdestandarddirs.h> @@ -779,7 +779,7 @@ void Transfer::logMessage(const TQString & message) -bool Transfer::read(KSimpleConfig * config, int id) +bool Transfer::read(TDESimpleConfig * config, int id) { sDebugIn << endl; @@ -815,7 +815,7 @@ bool Transfer::read(KSimpleConfig * config, int id) } -void Transfer::write(KSimpleConfig * config, int id) +void Transfer::write(TDESimpleConfig * config, int id) { sDebugIn << endl; diff --git a/kget/transfer.h b/kget/transfer.h index e0d44318..b48c0d58 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -40,7 +40,7 @@ class TQTimer; -class KSimpleConfig; +class TDESimpleConfig; class TDEAction; class TDERadioAction; @@ -72,8 +72,8 @@ public: void synchronousAbort(); - bool read(KSimpleConfig * config, int id); - void write(KSimpleConfig * config, int id); + bool read(TDESimpleConfig * config, int id); + void write(TDESimpleConfig * config, int id); void logMessage(const TQString & message); bool keepDialogOpen() const; diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 17f0b743..b07c0270 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -31,7 +31,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeio/netaccess.h> #include "transfer.h" @@ -230,7 +230,7 @@ void TransferList::readTransfers(const KURL& file) TQString tmpFile; if (TDEIO::NetAccess::download(file, tmpFile, (TQWidget*)parent())) { - KSimpleConfig config(tmpFile); + TDESimpleConfig config(tmpFile); config.setGroup("Common"); int num = config.readNumEntry("Count", 0); @@ -265,7 +265,7 @@ void TransferList::writeTransfers(const TQString& file) { sDebug << ">>>>Entering with file =" << file << endl; - KSimpleConfig config(file); + TDESimpleConfig config(file); int num = childCount(); config.setGroup("Common"); diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index a930b6f7..838e5016 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -29,7 +29,7 @@ // KDE includes #include <tdeapplication.h> #include <tdeunittest/module.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index f0b7a1ce..a6ed1067 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <tdeparts/componentfactory.h> #include <kplugininfo.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kstaticdeleter.h> #include <kurl.h> diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index 835c63ba..592f484e 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -23,7 +23,7 @@ #include <tqfile.h> #include <tdeapplication.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeprocess.h> #include <tdeunittest/module.h> #include <kdebug.h> diff --git a/kopete/libkopete/ui/kopete.widgets b/kopete/libkopete/ui/kopete.widgets index 54435dda..594e306d 100644 --- a/kopete/libkopete/ui/kopete.widgets +++ b/kopete/libkopete/ui/kopete.widgets @@ -1,6 +1,6 @@ [Global] PluginName=KopeteWidgets -Includes=kinstance.h +Includes=tdeinstance.h Init=new TDEInstance("kopetewidgets"); [Kopete::UI::ListView::ListView] diff --git a/kopete/libkopete/ui/kopetewidgets.cpp b/kopete/libkopete/ui/kopetewidgets.cpp index 1547ac92..e0382aaa 100644 --- a/kopete/libkopete/ui/kopetewidgets.cpp +++ b/kopete/libkopete/ui/kopetewidgets.cpp @@ -5,7 +5,7 @@ */ #include <tqwidgetplugin.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <addressbooklinkwidget.h> #include <kopetelistview.h> #include <kopetelistviewsearchline.h> diff --git a/kopete/protocols/configure.in.in b/kopete/protocols/configure.in.in index 7a96cc9a..0e201dc7 100644 --- a/kopete/protocols/configure.in.in +++ b/kopete/protocols/configure.in.in @@ -157,5 +157,5 @@ AC_MSG_RESULT($compile_smsgsm) AM_CONDITIONAL(include_smsgsm, [test "x$compile_smsgsm" = "xyes"]) if test "x$compile_smsgsm" = "xyes"; then - AC_DEFINE(INCLUDE_SMSGSM, 1, [Define to compile with GSM SMS support]) + AC_DEFINE(HAVE_GSMLIB, 1, [Define to compile with GSM SMS support]) fi diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 6fd6b7e1..4c726a53 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -49,7 +49,7 @@ #include <kinputdialog.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <kuser.h> diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index 543a2387..55b3670d 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -40,7 +40,7 @@ #include <kgenericfactory.h> #include <kdebug.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdemessagebox.h> #include "kopeteglobal.h" @@ -85,7 +85,7 @@ void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) c * LastName= */ - KSimpleConfig file(url.path(), true); + TDESimpleConfig file(url.path(), true); if (file.hasGroup("ICQ User")) file.setGroup("ICQ User"); diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp index d242e300..0e2c60a8 100644 --- a/kopete/protocols/sms/serviceloader.cpp +++ b/kopete/protocols/sms/serviceloader.cpp @@ -23,7 +23,7 @@ #include "serviceloader.h" #include "smssend.h" #include "smsclient.h" -#ifdef INCLUDE_SMSGSM +#ifdef HAVE_GSMLIB # include "gsmlib.h" #endif #include "kopeteuiglobal.h" @@ -37,7 +37,7 @@ SMSService* ServiceLoader::loadService(const TQString& name, Kopete::Account* ac s = new SMSSend(account); else if (name == "SMSClient") s = new SMSClient(account); -#ifdef INCLUDE_SMSGSM +#ifdef HAVE_GSMLIB else if (name == "GSMLib") s = new GSMLib(account); #endif @@ -56,7 +56,7 @@ TQStringList ServiceLoader::services() TQStringList toReturn; toReturn.append("SMSSend"); toReturn.append("SMSClient"); -#ifdef INCLUDE_SMSGSM +#ifdef HAVE_GSMLIB toReturn.append("GSMLib"); #endif return toReturn; diff --git a/kopete/protocols/sms/services/CMakeLists.txt b/kopete/protocols/sms/services/CMakeLists.txt index c9942bd6..2be778ad 100644 --- a/kopete/protocols/sms/services/CMakeLists.txt +++ b/kopete/protocols/sms/services/CMakeLists.txt @@ -11,22 +11,24 @@ # FIXME KDE_CXXFLAGS = $(USE_EXCEPTIONS) -include( ConfigureChecks.cmake ) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/kopete/libkopete ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) +if( WITH_GSM ) + set( GSM_SOURCES gsmlib.cpp gsmlibprefs.ui kopete_unix_serial.cpp ) +endif( ) ##### kopetesmsservices (static) ################ tde_add_library( kopetesmsservices STATIC_PIC AUTOMOC SOURCES smssend.cpp smssendprefs.ui smssendprovider.cpp smsclient.cpp - smsclientprefs.ui gsmlib.cpp gsmlibprefs.ui kopete_unix_serial.cpp + smsclientprefs.ui ${GSM_SOURCES} LINK ${GSM_LIBRARY} ) diff --git a/kopete/protocols/sms/services/ConfigureChecks.cmake b/kopete/protocols/sms/services/ConfigureChecks.cmake deleted file mode 100644 index 4ed454b4..00000000 --- a/kopete/protocols/sms/services/ConfigureChecks.cmake +++ /dev/null @@ -1,30 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -if( WITH_GSM ) - - tde_save( CMAKE_REQUIRED_INCLUDES ) - set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ) - check_include_file_cxx( gsmlib/gsm_util.h HAVE_GSMLIB_GSM_UTIL_H ) - tde_restore( CMAKE_REQUIRED_INCLUDES ) - - if( HAVE_GSMLIB_GSM_UTIL_H ) - set( INCLUDE_SMSGSM 1 ) - find_library( GSM_LIBRARY gsmme ) - endif( ) - - if( NOT (HAVE_GSMLIB_GSM_UTIL_H AND GSM_LIBRARY) ) - tde_message_fatal( "gsmlib is required, but was not found on your system" ) - endif( ) - -endif( ) - -configure_file( config.h.cmake config.h @ONLY ) diff --git a/kopete/protocols/sms/services/config.h.cmake b/kopete/protocols/sms/services/config.h.cmake deleted file mode 100644 index 9555d535..00000000 --- a/kopete/protocols/sms/services/config.h.cmake +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine INCLUDE_SMSGSM 1 diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index d1d1e695..f8dcc1e3 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -13,7 +13,6 @@ ************************************************************************* */ #include "config.h" -#ifdef INCLUDE_SMSGSM #include <tqcombobox.h> #include <tqlayout.h> @@ -449,5 +448,3 @@ const TQString& GSMLib::description() } #include "gsmlib.moc" - -#endif diff --git a/kopete/protocols/sms/services/gsmlib.h b/kopete/protocols/sms/services/gsmlib.h index aa1bea5f..608c1f4c 100644 --- a/kopete/protocols/sms/services/gsmlib.h +++ b/kopete/protocols/sms/services/gsmlib.h @@ -17,7 +17,6 @@ #define GSMLIB_H_039562406 #include "config.h" -#ifdef INCLUDE_SMSGSM #include <unistd.h> @@ -148,5 +147,4 @@ protected: TQMutex m_outMessagesMutex; }; -#endif #endif //GSMLIB_H_039562406 diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index fc532ffd..84dfd839 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -11,7 +11,6 @@ // * Created: 10.5.1999 // ************************************************************************* #include "config.h" -#ifdef INCLUDE_SMSGSM #include <gsmlib/gsm_util.h> #include <termios.h> @@ -88,7 +87,7 @@ static void stopTimer() // KopeteUnixSerialPort members -void KopeteUnixSerialPort::throwModemException(string message) throw(GsmException) +void KopeteUnixSerialPort::throwModemException(string message) { ostringstream os; os << message << " (errno: " << errno << "/" << strerror(errno) << ")"; @@ -101,7 +100,7 @@ void KopeteUnixSerialPort::putBack(unsigned char c) _oldChar = c; } -int KopeteUnixSerialPort::readByte() throw(GsmException) +int KopeteUnixSerialPort::readByte() { if (_oldChar != -1) { @@ -166,8 +165,7 @@ int KopeteUnixSerialPort::readByte() throw(GsmException) } KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, - string initString, bool swHandshake) - throw(GsmException) : + string initString, bool swHandshake) : _oldChar(-1), _timeoutVal(TIMEOUT_SECS) { _readNotifier = NULL; @@ -326,7 +324,7 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, throwModemException("reset modem failed"); } -string KopeteUnixSerialPort::getLine() throw(GsmException) +string KopeteUnixSerialPort::getLine() { string result; int c; @@ -349,8 +347,7 @@ string KopeteUnixSerialPort::getLine() throw(GsmException) return result; } -void KopeteUnixSerialPort::putLine(string line, - bool carriageReturn) throw(GsmException) +void KopeteUnixSerialPort::putLine(string line, bool carriageReturn) { #ifndef NDEBUG if (debugLevel() >= 1) @@ -418,7 +415,7 @@ void KopeteUnixSerialPort::putLine(string line, // in order to properly handle unsolicited result codes from the ME/TA } -bool KopeteUnixSerialPort::wait(GsmTime timeout) throw(GsmException) +bool KopeteUnixSerialPort::wait(GsmTime timeout) { fd_set fds; FD_ZERO(&fds); @@ -441,5 +438,3 @@ KopeteUnixSerialPort::~KopeteUnixSerialPort() } #include "kopete_unix_serial.moc" - -#endif diff --git a/kopete/protocols/sms/services/kopete_unix_serial.h b/kopete/protocols/sms/services/kopete_unix_serial.h index fd8ed74c..9da7a9ce 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.h +++ b/kopete/protocols/sms/services/kopete_unix_serial.h @@ -15,7 +15,6 @@ #define GSM_UNIX_SERIAL_KOPETE_H #include "config.h" -#ifdef INCLUDE_SMSGSM #include <string> #include <gsmlib/gsm_error.h> @@ -43,23 +42,21 @@ protected: TQSocketNotifier* _readNotifier; // throw GsmException include UNIX errno - void throwModemException(std::string message) throw(GsmException); + void throwModemException(std::string message); public: // create Port given the UNIX device name KopeteUnixSerialPort(std::string device, speed_t lineSpeed = DEFAULT_BAUD_RATE, std::string initString = DEFAULT_INIT_STRING, - bool swHandshake = false) - throw(GsmException); + bool swHandshake = false); virtual ~KopeteUnixSerialPort(); // inherited from Port void putBack(unsigned char c); - int readByte() throw(GsmException); - std::string getLine() throw(GsmException); - void putLine(std::string line, - bool carriageReturn = true) throw(GsmException); - bool wait(GsmTime timeout) throw(GsmException); + int readByte(); + std::string getLine(); + void putLine(std::string line, bool carriageReturn = true); + bool wait(GsmTime timeout); void setTimeOut(unsigned int timeout); signals: @@ -67,5 +64,4 @@ signals: }; } -#endif #endif // GSM_UNIX_SERIAL_KOPETE_H diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index c403dd42..38dddb5f 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -150,7 +150,7 @@ void SMSSendProvider::setAccount(Kopete::Account *account) const TQString& SMSSendProvider::name(int i) { if ( telPos == i || messagePos == i) - return TQString(); + return TQString::null; else return names[i]; } diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index e2173ee0..f8e4c7a5 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -35,25 +35,11 @@ #include "smscontact.h" SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name ) - : Kopete::Account( parent, accountID, name ) + : Kopete::Account( parent, accountID, name ), theService(nullptr) { setMyself( new SMSContact(this, accountID, accountID, Kopete::ContactList::self()->myself()) ); loadConfig(); myself()->setOnlineStatus( SMSProtocol::protocol()->SMSOffline ); - - TQString sName = configGroup()->readEntry("ServiceName", TQString()); - theService = ServiceLoader::loadService(sName, this); - - if( theService ) - { - TQObject::connect (theService, TQ_SIGNAL(messageSent(const Kopete::Message &)), - this, TQ_SLOT(slotSendingSuccess(const Kopete::Message &))); - TQObject::connect (theService, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), - this, TQ_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &))); - TQObject::connect (theService, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected())); - TQObject::connect (theService, TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotDisconnected())); - } - } SMSAccount::~SMSAccount() @@ -64,9 +50,29 @@ SMSAccount::~SMSAccount() void SMSAccount::loadConfig() { + TQString serviceName = configGroup()->readEntry("ServiceName", TQString()); theSubEnable = configGroup()->readBoolEntry("SubEnable", false); theSubCode = configGroup()->readEntry("SubCode", TQString()); theLongMsgAction = (SMSMsgAction)configGroup()->readNumEntry("MsgAction", 0); + + if( theService && theService->name() != serviceName ) + { + delete theService; + theService = nullptr; + } + + if( !theService && !serviceName.isEmpty() ) + theService = ServiceLoader::loadService(serviceName, this); + + if( theService ) + { + TQObject::connect (theService, TQ_SIGNAL(messageSent(const Kopete::Message &)), + this, TQ_SLOT(slotSendingSuccess(const Kopete::Message &))); + TQObject::connect (theService, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), + this, TQ_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &))); + TQObject::connect (theService, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected())); + TQObject::connect (theService, TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotDisconnected())); + } } void SMSAccount::translateNumber(TQString &theNumber) diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index 5994534d..6283c2dd 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -92,18 +92,28 @@ bool SMSEditAccountWidget::validateData() Kopete::Account* SMSEditAccountWidget::apply() { - if (!account()) - setAccount( new SMSAccount( m_protocol, preferencesDialog->accountId->text() ) ); + SMSAccount *smsAccount; + + if (account()) { + smsAccount = dynamic_cast<SMSAccount*>(account()); + } else { + smsAccount = new SMSAccount( m_protocol, + preferencesDialog->accountId->text() ); + setAccount( smsAccount ); + } + Q_ASSERT( smsAccount ); if (service) service->setAccount(account()); - + TDEConfigGroup *c = account()->configGroup(); c->writeEntry("ServiceName", preferencesDialog->serviceName->currentText()); c->writeEntry("SubEnable", preferencesDialog->subEnable->isChecked() ? "true" : "false"); c->writeEntry("SubCode", preferencesDialog->subCode->text()); c->writeEntry("MsgAction", preferencesDialog->ifMessageTooLong->currentItem()); + smsAccount->loadConfig(); + emit saved(); return account(); } diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 4a0c978b..f4f6b45e 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <tdemessagebox.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> // Kopete Includes diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index bfa05fcf..8b504a80 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <klineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> // Local Includes #include "wpuserinfo.h" diff --git a/kopete/protocols/yahoo/yahooprotocol.cpp b/kopete/protocols/yahoo/yahooprotocol.cpp index afd23cab..d988bdc8 100644 --- a/kopete/protocols/yahoo/yahooprotocol.cpp +++ b/kopete/protocols/yahoo/yahooprotocol.cpp @@ -21,7 +21,7 @@ /* KDE Includes */ #include <kdebug.h> #include <kgenericfactory.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> /* Local Includes */ #include "yahooprotocol.h" diff --git a/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png b/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png Binary files differindex 3da872ad..80570f98 100644..100755 --- a/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png +++ b/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png diff --git a/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png b/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png Binary files differindex d8b46bc1..35e92460 100644..100755 --- a/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png +++ b/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index 37dbcce9..60351e0b 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -41,7 +41,7 @@ #include "pppdata.h" #include <tqlistbox.h> #include <tqlineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #define UNENCODED_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_" @@ -130,7 +130,7 @@ void ProviderDB::loadProviderInfo() { TQString fname = locate("appdata", prov); kdDebug(5002) << "Providerfile=" << fname << endl; - cfg = new KSimpleConfig(fname, true); + cfg = new TDESimpleConfig(fname, true); } @@ -224,7 +224,7 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { TQString dirFile(fi->absFilePath()+"/.directory"); TQString entryName; if(TQFile::exists(dirFile)){ - KSimpleConfig config(dirFile); + TDESimpleConfig config(dirFile); config.setDesktopGroup(); entryName = config.readEntry("Name"); } diff --git a/kppp/providerdb.h b/kppp/providerdb.h index 4e60baa7..f7a64201 100644 --- a/kppp/providerdb.h +++ b/kppp/providerdb.h @@ -40,7 +40,7 @@ class TQLineEdit; class TQListBox; -class KSimpleConfig; +class TDESimpleConfig; class PDB_Intro : public TQWidget { TQ_OBJECT @@ -136,7 +136,7 @@ public slots: private: void loadProviderInfo(); - KSimpleConfig *cfg; + TDESimpleConfig *cfg; PDB_Intro *page1; PDB_Country *page2; diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index b50cde3d..7f7ec081 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -33,6 +33,7 @@ #include <tdemessagebox.h> #include <twin.h> #include <tdestartupinfo.h> +#include <tqclipboard.h> #include <tqdockarea.h> #include <tqlabel.h> @@ -51,6 +52,7 @@ const int FS_HOSTLABEL_ID = 4; const int FS_ADVANCED_ID = 5; const int FS_ICONIFY_ID = 6; const int FS_CLOSE_ID = 7; +const int FS_PASTE_ID = 8; const int KRDC::TOOLBAR_AUTOHIDE_TIMEOUT = 1000; const int KRDC::TOOLBAR_FPS_1000 = 10000; @@ -373,6 +375,13 @@ void KRDC::enableFullscreen(bool on) m_view->switchFullscreen(on); } +void KRDC::paste() +{ + TQClipboard *cb = TQApplication::clipboard(); + TQString text = cb->text(TQClipboard::Clipboard); + m_view->sendString(text); +} + TQSize KRDC::sizeHint() { if ((m_isFullscreen != WINDOW_MODE_FULLSCREEN) && m_toolbar) { @@ -499,6 +508,14 @@ void KRDC::switchToFullscreen(bool scaling) t->setButton(FS_FULLSCREEN_ID, true); t->addConnection(FS_FULLSCREEN_ID, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFullscreen(bool))); + if(m_view->supportsSendString()) + { + t->insertButton("edit-paste", FS_PASTE_ID); + TDEToolBarButton *pasteButton = t->getButton(FS_PASTE_ID); + TQToolTip::add(pasteButton, i18n("Sends clipboard text to the remote system as key presses")); + t->addConnection(FS_PASTE_ID, TQ_SIGNAL(clicked()), this, TQ_SLOT(paste())); + } + m_popup = createPopupMenu(t); t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options")); TDEToolBarButton *advancedButton = t->getButton(FS_ADVANCED_ID); @@ -621,6 +638,14 @@ void KRDC::switchToNormal(bool scaling) m_popup = 0; } + if(m_view->supportsSendString()) + { + t->insertButton("edit-paste", 4, true, i18n("Paste")); + TDEToolBarButton *pasteButton = t->getButton(4); + TQToolTip::add(pasteButton, i18n("Sends clipboard text to the remote system as key presses")); + t->addConnection(4, TQ_SIGNAL(clicked()), this, TQ_SLOT(paste())); + } + m_popup = createPopupMenu(t); t->insertButton("configure", 3, m_popup, true, i18n("Advanced")); TDEToolBarButton *advancedButton = t->getButton(3); diff --git a/krdc/krdc.h b/krdc/krdc.h index b84741d9..b72a5378 100644 --- a/krdc/krdc.h +++ b/krdc/krdc.h @@ -163,6 +163,7 @@ private slots: public slots: void quit(); void enableFullscreen(bool full = false); + void paste(); void switchToNormal(bool scaling = false); void switchToFullscreen(bool scaling = false); void viewOnlyToggled(); diff --git a/krdc/kremoteview.cpp b/krdc/kremoteview.cpp index 76ae6267..e53fb918 100644 --- a/krdc/kremoteview.cpp +++ b/krdc/kremoteview.cpp @@ -86,4 +86,10 @@ void KRemoteView::enableScaling(bool) { void KRemoteView::switchFullscreen(bool) { } +bool KRemoteView::supportsSendString() const { + return false; +} + +void KRemoteView::sendString(const TQString &s) {} + #include "kremoteview.moc" diff --git a/krdc/kremoteview.h b/krdc/kremoteview.h index 9510153f..a735ebe0 100644 --- a/krdc/kremoteview.h +++ b/krdc/kremoteview.h @@ -227,6 +227,18 @@ public slots: */ virtual void pressKey(XEvent *k) = 0; + /** + * Checks whether the backend sending a string of characters. + * Default implementation returns false. + */ + virtual bool supportsSendString() const; + + /** + * Sends a string of characters to the remote server as key presses. + * Default implementation does nothing. + */ + virtual void sendString(const TQString &s); + signals: /** * Emitted when the size of the remote screen changes. Also diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index b4025c2d..3a69cdd2 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -645,6 +645,57 @@ void KVncView::pressKey(XEvent *xe) { m_mods.clear(); } +bool KVncView::supportsSendString() const +{ + return true; +} + +void KVncView::sendString(const TQString &s) +{ + if (m_status != REMOTE_VIEW_CONNECTED) + return; + if (m_viewOnly) + return; + + for(uint i = 0; i < s.length(); ++i) + { + /* X11 reserves keysyms 0x01000000 to 0x0110FFFF for Unicode code-points + * (see keysymdef.h). + */ + uint sym = s[i].unicode() + 0x01000000; + + /* Convert line breaks to return (enter). */ + if(s[i] == '\n') + { + sym = XK_Return; + } + + /* If the character is upper-case and below code-point 0x3000 (most western + * languages), assume the shift key is required (based on kkeyserver_x11.cpp). + */ + bool shift = false; + if(s[i].unicode() < 0x3000 && s[i].isLetter() && s[i].lower() != s[i].upper() && s[i] == s[i].upper()) + { + m_cthreadObject.queueKeyEvent(XK_Shift_L, true); + shift = true; + } + + m_cthreadObject.queueKeyEvent(sym, true); + m_cthreadObject.queueKeyEvent(sym, false); + + if(shift) + { + m_cthreadObject.queueKeyEvent(XK_Shift_L, false); + } + + #if 0 + fprintf(stderr, "Sent character: '%s' (sym = %u, shift = %s)\n", + (const char*)(TQString(s[i]).local8Bit()), + (unsigned)(sym), (shift ? "yes" : "no")); + #endif + } +} + bool KVncView::x11Event(XEvent *e) { bool pressed; if (e->type == KeyPress) diff --git a/krdc/vnc/kvncview.h b/krdc/vnc/kvncview.h index f62b8819..7737ba7f 100644 --- a/krdc/vnc/kvncview.h +++ b/krdc/vnc/kvncview.h @@ -114,6 +114,8 @@ public slots: virtual void enableScaling(bool s); virtual void setViewOnly(bool s); virtual void pressKey(XEvent *k); + virtual bool supportsSendString() const; + virtual void sendString(const TQString &s); private slots: diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp index 5f7372db..b713723f 100644 --- a/ktalkd/kcmktalkd/answmachpage.cpp +++ b/ktalkd/kcmktalkd/answmachpage.cpp @@ -24,18 +24,18 @@ #include "answmachpage.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <stdlib.h> #include <tdelocale.h> // for getenv KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, - KSimpleConfig *_config) + TDESimpleConfig *_config) : TDECModule (parent, name) { if (!_config) { delete_config = true; - config = new KSimpleConfig("ktalkdrc"); + config = new TDESimpleConfig("ktalkdrc"); } else { delete_config = false; diff --git a/ktalkd/kcmktalkd/answmachpage.h b/ktalkd/kcmktalkd/answmachpage.h index d76d724d..0b4f8d49 100644 --- a/ktalkd/kcmktalkd/answmachpage.h +++ b/ktalkd/kcmktalkd/answmachpage.h @@ -37,7 +37,7 @@ #include <tdecmodule.h> -class KSimpleConfig; +class TDESimpleConfig; class KAnswmachPageConfig : public TDECModule { @@ -46,7 +46,7 @@ class KAnswmachPageConfig : public TDECModule public: KAnswmachPageConfig( TQWidget *parent=0, const char* name=0, - KSimpleConfig *config=0 ); + TDESimpleConfig *config=0 ); ~KAnswmachPageConfig( ); void load(); @@ -61,7 +61,7 @@ private slots: void slotChanged(); private: - KSimpleConfig *config; + TDESimpleConfig *config; bool delete_config; TQCheckBox *answmach_cb; diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp index 20f09d4f..30d19f2a 100644 --- a/ktalkd/kcmktalkd/forwmachpage.cpp +++ b/ktalkd/kcmktalkd/forwmachpage.cpp @@ -23,16 +23,16 @@ #include "forwmachpage.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name, - KSimpleConfig *_config) + TDESimpleConfig *_config) : TDECModule (parent, name) { if (!_config) { delete_config = true; - config = new KSimpleConfig("ktalkdrc"); + config = new TDESimpleConfig("ktalkdrc"); } else { delete_config = false; diff --git a/ktalkd/kcmktalkd/forwmachpage.h b/ktalkd/kcmktalkd/forwmachpage.h index 16be13c4..2f558c59 100644 --- a/ktalkd/kcmktalkd/forwmachpage.h +++ b/ktalkd/kcmktalkd/forwmachpage.h @@ -37,7 +37,7 @@ #include <tdecmodule.h> -class KSimpleConfig; +class TDESimpleConfig; class KForwmachPageConfig : public TDECModule { @@ -46,7 +46,7 @@ class KForwmachPageConfig : public TDECModule public: KForwmachPageConfig( TQWidget *parent=0, const char* name=0, - KSimpleConfig *config=0); + TDESimpleConfig *config=0); ~KForwmachPageConfig( ); void load(); @@ -61,7 +61,7 @@ private slots: void slotChanged(); private: - KSimpleConfig *config; + TDESimpleConfig *config; bool delete_config; TQCheckBox *forwmach_cb; diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp index d6987c7d..3c268e39 100644 --- a/ktalkd/kcmktalkd/main.cpp +++ b/ktalkd/kcmktalkd/main.cpp @@ -24,7 +24,7 @@ #include "soundpage.h" #include "answmachpage.h" #include "forwmachpage.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <tdeglobal.h> #include <tqtabwidget.h> @@ -33,8 +33,8 @@ KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name) : TDECModule(parent, name) { - config = new KSimpleConfig("ktalkdrc"); - announceconfig = new KSimpleConfig("ktalkannouncerc"); + config = new TDESimpleConfig("ktalkdrc"); + announceconfig = new TDESimpleConfig("ktalkannouncerc"); TQVBoxLayout *layout = new TQVBoxLayout(this); diff --git a/ktalkd/kcmktalkd/main.h b/ktalkd/kcmktalkd/main.h index 2d4223ba..7d10dc14 100644 --- a/ktalkd/kcmktalkd/main.h +++ b/ktalkd/kcmktalkd/main.h @@ -26,7 +26,7 @@ class TQTabWidget; -class KSimpleConfig; +class TDESimpleConfig; class KSoundPageConfig; class KAnswmachPageConfig; @@ -51,8 +51,8 @@ class KTalkdConfigModule : public TDECModule void resizeEvent(TQResizeEvent *); private: - KSimpleConfig *config; - KSimpleConfig *announceconfig; + TDESimpleConfig *config; + TDESimpleConfig *announceconfig; TQTabWidget *tab; diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index dab372ae..ff1a57df 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -33,7 +33,7 @@ #include <tqcheckbox.h> #include <klineedit.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdestandarddirs.h> #include <tdelocale.h> #include <kaudioplayer.h> @@ -45,13 +45,13 @@ /* Lots of stuff taken from syssound.cpp */ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, - KSimpleConfig *_config, KSimpleConfig *_announceconfig) + TDESimpleConfig *_config, TDESimpleConfig *_announceconfig) : TDECModule (parent, name) { if (!_config) { delete_config = true; - config = new KSimpleConfig("ktalkdrc"); - announceconfig = new KSimpleConfig(""); + config = new TDESimpleConfig("ktalkdrc"); + announceconfig = new TDESimpleConfig(""); } else { delete_config = false; diff --git a/ktalkd/kcmktalkd/soundpage.h b/ktalkd/kcmktalkd/soundpage.h index 8d99cefc..56cc3e4e 100644 --- a/ktalkd/kcmktalkd/soundpage.h +++ b/ktalkd/kcmktalkd/soundpage.h @@ -36,7 +36,7 @@ class TQDragMoveEvent; class TQDragEnterEvent; class TQDropEvent; -class KSimpleConfig; +class TDESimpleConfig; class KURLRequester; class TQCheckBox; class TQLabel; @@ -50,7 +50,7 @@ class KSoundPageConfig : public TDECModule public: KSoundPageConfig( TQWidget *parent=0, const char* name=0, - KSimpleConfig *config=0, KSimpleConfig *announceconfig=0); + TDESimpleConfig *config=0, TDESimpleConfig *announceconfig=0); ~KSoundPageConfig( ); void load(); @@ -69,8 +69,8 @@ private slots: void sound_listDropEvent(TQDropEvent* e); private: - KSimpleConfig *config; - KSimpleConfig *announceconfig; + TDESimpleConfig *config; + TDESimpleConfig *announceconfig; bool delete_config; TQLabel *extprg_label; diff --git a/ktalkd/ktalkd/readcfg++.cpp b/ktalkd/ktalkd/readcfg++.cpp index 1fe374e1..6c104363 100644 --- a/ktalkd/ktalkd/readcfg++.cpp +++ b/ktalkd/ktalkd/readcfg++.cpp @@ -52,7 +52,7 @@ /* KDE & TQt includes */ #include <tdeconfig.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqfile.h> /* Ktalkd includes */ diff --git a/ktalkd/ktalkd/talkd.cpp b/ktalkd/ktalkd/talkd.cpp index cef384d2..da157a57 100644 --- a/ktalkd/ktalkd/talkd.cpp +++ b/ktalkd/ktalkd/talkd.cpp @@ -71,7 +71,7 @@ char copyright[] = #include "machines/answmach.h" #include "machines/talkconn.h" -#include <kinstance.h> +#include <tdeinstance.h> KTalkdTable * ktable; #define TIMEOUT 20 diff --git a/lanbrowsing/tdeio_lan/tdeio_lan.cpp b/lanbrowsing/tdeio_lan/tdeio_lan.cpp index 2dd84be1..eeb90a61 100644 --- a/lanbrowsing/tdeio_lan/tdeio_lan.cpp +++ b/lanbrowsing/tdeio_lan/tdeio_lan.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeconfig.h> #include <tdeglobal.h> #include <tdeprocess.h> diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp index f1b1eee2..04d34e91 100644 --- a/tdednssd/ioslave/dnssd.cpp +++ b/tdednssd/ioslave/dnssd.cpp @@ -34,7 +34,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdesocketaddress.h> diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 6d529ea1..559eb087 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdeprocio.h> @@ -187,7 +187,7 @@ WifiConfig *WifiConfig::instance() WifiConfig::WifiConfig() { //m_config = TDEGlobal::config(); - m_config = new KSimpleConfig( "kcmwifirc" ); + m_config = new TDESimpleConfig( "kcmwifirc" ); load(); } diff --git a/wifi/kcmwifi/wificonfig.h b/wifi/kcmwifi/wificonfig.h index 5a1ba44e..7f289cdf 100644 --- a/wifi/kcmwifi/wificonfig.h +++ b/wifi/kcmwifi/wificonfig.h @@ -26,7 +26,7 @@ #include "kcmwifi.h" class TDEConfig; -class KSimpleConfig; +class TDESimpleConfig; enum KeyStates { EMPTY=0, INVALID=1, HEX_64=2, HEX_128=3, HEX_256=4, STRING_64=5, STRING_128=6, STRING_256=7 }; @@ -119,7 +119,7 @@ class WifiConfig : TQObject private: WifiConfig(); - KSimpleConfig *m_config; + TDESimpleConfig *m_config; static WifiConfig *m_instance; TQString m_detectedInterface; }; |
