From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kab/addressbook.cc | 6 +++--- kab/addressbook.h | 6 +++--- kab/kabapi.cc | 4 ++-- kab/qconfigDB.cc | 16 ++++++++-------- kab/qconfigDB.h | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kab') diff --git a/kab/addressbook.cc b/kab/addressbook.cc index d5813237c..9795c42a7 100644 --- a/kab/addressbook.cc +++ b/kab/addressbook.cc @@ -139,7 +139,7 @@ KabKey::setKey(const TQCString& text) // ########################################################################### } -QCString +TQCString KabKey::getKey() const { // ########################################################################### @@ -1729,7 +1729,7 @@ AddressBook::makeEntryFromVCard(const TQString&, Entry&) // ########################################################################### } -QString +TQString AddressBook::getStandardFileName() { // ########################################################################### @@ -1814,7 +1814,7 @@ AddressBook::ErrorCode AddressBook::Entry::get(const char* fieldname, TQVariant& } if(fieldname==Fields[dummy++]) { // the birthday - field=birthday.toString(); + field=TQString(birthday.toString()); return NoError; } if(fieldname==Fields[dummy++]) diff --git a/kab/addressbook.h b/kab/addressbook.h index 5057c990c..2e6656bed 100644 --- a/kab/addressbook.h +++ b/kab/addressbook.h @@ -127,7 +127,7 @@ class CategoriesMap : public TQMap * keys). Of course, in different files a key might be used twice.
* The keys are objects of the type KabKey and define the section in the * addressbook database where the entry is stored (see QConfigDB - * reference). Keys invalidate on file changes, so keep track of the + * reference). Keys tqinvalidate on file changes, so keep track of the * signal ::changed.
* kab watches file changes. If the opened file changes on disk, it is * automatically reloaded and ::changed() is emitted. @@ -180,7 +180,7 @@ class CategoriesMap : public TQMap * displayed as transparent KURLLabels that react when the user clicks on it. * These interactive parts have to be enabled by calling setInteractiveMode(). */ -class AddressBook : public QFrame +class AddressBook : public TQFrame { // ############################################################################ Q_OBJECT @@ -572,7 +572,7 @@ public: ErrorCode createConfigFile(); ErrorCode loadConfigFile(); /**< Load the local configuration file. */ // ErrorCode configureKab(); /**< Open the configuration dialog for the KabAPI. */ - // TQSize sizeHint(); /**< The preferred (minimal) size of the view. */ // ni + // TQSize tqsizeHint(); /**< The preferred (minimal) size of the view. */ // ni /** * This method parses a vCard and creates an Entry object from it. */ diff --git a/kab/kabapi.cc b/kab/kabapi.cc index 0cf97905c..0910df18b 100644 --- a/kab/kabapi.cc +++ b/kab/kabapi.cc @@ -72,9 +72,9 @@ int KabAPI::exec() { listbox->setCurrentItem(0); } - listbox->setMinimumSize(listbox->sizeHint()); + listbox->setMinimumSize(listbox->tqsizeHint()); adjustSize(); - resize(minimumSize()); + resize(tqminimumSize()); return KDialogBase::exec(); } else { kdDebug(KAB_KDEBUG_AREA) << "KabAPI::exec: error creating interface." diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cc index a49388ff9..a682a1ed1 100644 --- a/kab/qconfigDB.cc +++ b/kab/qconfigDB.cc @@ -73,7 +73,7 @@ static void tokenize(list& res, const TQCString& text, char tr, bool while(zwei!=-1) { teil=""; - zwei=text.find(tr, eins); + zwei=text.tqfind(tr, eins); if(zwei!=-1) { teil=text.mid(eins, zwei-eins); @@ -412,7 +412,7 @@ KeyValueMap::parseComplexString return true; } -QCString +TQCString KeyValueMap::makeComplexString(const TQCString& orig) { register bool GUARD; GUARD=false; @@ -573,7 +573,7 @@ KeyValueMap::insertLine(TQCString line, bool force, bool relax, bool encode) return false; } // ----- - index=line.find('='); + index=line.tqfind('='); if(index==-1) // not found { kdDebug() << "KeyValueMap::insertLine: no \"=\" found in \""<& values) const second=first; for(;;) { - second=raw.find('\\', second); + second=raw.tqfind('\\', second); // ----- this may never be the last and also not the second last // character in a complex string: if(second!=-1) @@ -1124,7 +1124,7 @@ KeyValueMap::get(const TQCString& key, TQStrList& values) const second=first; for(;;) { - second=raw.find('\\', second); + second=raw.tqfind('\\', second); // ----- this may never be the last and also not the second last // character in a complex string: if(second!=-1) @@ -1725,7 +1725,7 @@ Section::isEndOfSection(TQCString line) // ########################################################################### } -QCString +TQCString Section::nameOfSection(const TQCString& line) { register bool GUARD; GUARD=false; @@ -1975,7 +1975,7 @@ QConfigDB::stringToKeylist(const TQCString& desc) } for(;;) { - second=desc.find('/', first); + second=desc.tqfind('/', first); if(second==-1) { if((unsigned)first