diff options
| -rw-r--r-- | kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp | 6 | ||||
| -rw-r--r-- | kate/filetemplates/plugin/filetemplates.cpp | 2 | ||||
| -rw-r--r-- | kicker-applets/mediacontrol/kscdInterface.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index 403e9f8..c5909c4 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -99,7 +99,7 @@ KABC::AddresseeList GMXXXPort::importContacts( const TQString& ) const typedef TQMap<TQString, KABC::Addressee *> AddressMap; AddressMap addrMap; - // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,Change_date,tqStatus,Address_link_id,Categories" + // "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments,Change_date,Status,Address_link_id,Categories" line = gmxStream.readLine(); while (!line.startsWith("####") && !gmxStream.atEnd()) { while (1) { @@ -264,7 +264,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) t << "AB_ADDRESSES:\n"; t << "Address_id,Nickname,Firstname,Lastname,Title,Birthday,Comments," - "Change_date,tqStatus,Address_link_id,Categories\n"; + "Change_date,Status,Address_link_id,Categories\n"; int no = 0; const TQChar DELIM('#'); @@ -288,7 +288,7 @@ void GMXXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) t << "AB_ADDRESS_RECORDS:\n"; t << "Address_id,Record_id,Street,Country,Zipcode,City,Phone,Fax,Mobile," "Mobile_type,Email,Homepage,Position,Comments,Record_type_id,Record_type," - "Company,Department,Change_date,Preferred,tqStatus\n"; + "Company,Department,Change_date,Preferred,Status\n"; no = 1; while ( (addr = addrMap[no]) != NULL ) { diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 2ed6036..6f51e9b 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -1216,7 +1216,7 @@ void KateTemplateManager::slotRemoveTemplate() // for this template, so the template is installable again. // ### This assumes that the knewstuff name is similar to the template name. kdDebug()<<"trying to remove knewstuff key '"<<item->templateinfo->tmplate<<"'"<<endl; - config->setGroup("KNewStufftqStatus"); + config->setGroup("KNewStuffStatus"); config->deleteEntry( item->templateinfo->tmplate ); diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp index d14d609..67eb931 100644 --- a/kicker-applets/mediacontrol/kscdInterface.cpp +++ b/kicker-applets/mediacontrol/kscdInterface.cpp @@ -310,7 +310,7 @@ int KsCDInterface::playingtqStatus() TQByteArray data, replyData; TQCString replyType; - if (kapp->dcopClient()->call(mAppId, "CDPlayer", "gettqStatus()", data, replyType, + if (kapp->dcopClient()->call(mAppId, "CDPlayer", "getStatus()", data, replyType, replyData)) { int status = 0; |