diff options
Diffstat (limited to 'conduits')
86 files changed, 488 insertions, 472 deletions
diff --git a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui index 54782b8..63f6897 100644 --- a/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui +++ b/conduits/abbrowserconduit/KPilotCustomFieldEditor.ui @@ -2,7 +2,7 @@ <class>KPilotCustomFields</class> <comment>This form lets you edit the custom fields synced from PalmOS handhelds by the addressbook conduit of KPilot.</comment> <author>Reinhold Kainhofer <reinhold@kainhofer.com></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KPILOT</cstring> </property> @@ -24,7 +24,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mCustomFieldsGroups</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>mCustom3Label</cstring> </property> @@ -52,7 +52,7 @@ <string><qt>Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>mCustom4Label</cstring> </property> @@ -66,7 +66,7 @@ <string><qt>Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>X_CUSTOM2</cstring> </property> @@ -74,7 +74,7 @@ <string><qt>Edit or enter the value of the third custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>X_CUSTOM1</cstring> </property> @@ -82,7 +82,7 @@ <string><qt>Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>X_CUSTOM3</cstring> </property> @@ -90,7 +90,7 @@ <string><qt>Edit or enter the value of the fourth custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>mCustom2Label</cstring> </property> @@ -104,7 +104,7 @@ <string><qt>Edit or enter the value of the second custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mCustom1Label</cstring> </property> @@ -118,7 +118,7 @@ <string><qt>Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>X_CUSTOM0</cstring> </property> @@ -134,7 +134,7 @@ <string><qt>Edit or enter the value of the first custom field here. Using KPilot, you can synchronize these values with the handheld's Address application custom fields.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>mCustomFieldsExplanation</cstring> </property> @@ -147,7 +147,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mMetaSyncGroup</cstring> </property> @@ -161,7 +161,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mRecordIDLabel</cstring> </property> @@ -172,7 +172,7 @@ <cstring>X_RecordID</cstring> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>mSyncFlagLabel</cstring> </property> @@ -217,7 +217,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>mMetaSyncSettingsWarning</cstring> </property> @@ -229,7 +229,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>X_RecordID</cstring> </property> @@ -240,7 +240,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w <number>2147483647</number> </property> </widget> - <widget class="QSpinBox" row="1" column="4"> + <widget class="TQSpinBox" row="1" column="4"> <property name="name"> <cstring>X_Flag</cstring> </property> diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am index 6985522..40c739a 100644 --- a/conduits/abbrowserconduit/Makefile.am +++ b/conduits/abbrowserconduit/Makefile.am @@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \ abbrowser-setup.cc \ kabcRecord.cc \ abbrowser-conduit.cc -conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lkdecore -lkio -lkdeui +conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file servicedir = $(kde_servicesdir) diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index e4f674a..7de5582 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook() emit logError(i18n("You chose to sync with the file \"%1\", which " "cannot be opened. Please make sure to supply a " "valid file name in the conduit's configuration dialog. " - "Aborting the conduit.").arg(AbbrowserSettings::fileName())); + "Aborting the conduit.").tqarg(AbbrowserSettings::fileName())); KIO::NetAccess::removeTempFile(fABookFile); stopTickle(); return false; @@ -395,7 +395,7 @@ bool AbbrowserConduit::_saveAddressBook() if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) { emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload " "the temporary local file \"%2\" manually") - .arg(AbbrowserSettings::fileName()).arg(fABookFile)); + .tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile)); } else { KIO::NetAccess::removeTempFile(fABookFile); @@ -476,7 +476,7 @@ void AbbrowserConduit::showPilotAddress(const PilotAddress *pilotAddress) } DEBUGKPILOT << fname << "\n" << pilotAddress->getTextRepresentation( - fAddressAppInfo,Qt::PlainText) << endl; + fAddressAppInfo,TQt::PlainText) << endl; } @@ -762,7 +762,7 @@ void AbbrowserConduit::slotDeletedRecord() recordid_t id = backupRec->id(); TQString uid = addresseeMap[id]; - Addressee e = aBook->tqfindByUid(uid); + Addressee e = aBook->findByUid(uid); DEBUGKPILOT << fname << ": now looking at palm id: [" << id << "], kabc uid: [" << uid << "]." << endl; @@ -779,7 +779,7 @@ void AbbrowserConduit::slotDeletedRecord() DEBUGKPILOT << fname << ": no Addressee found for this id." << endl; DEBUGKPILOT << fname << "\n" << backupAddr->getTextRepresentation( - fAddressAppInfo,Qt::PlainText) << endl; + fAddressAppInfo,TQt::PlainText) << endl; if (palmRec) { DEBUGKPILOT << fname << ": deleting from database on palm." << endl; @@ -1493,7 +1493,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString // If this is a first sync, we don't have a backup record, so if(isFirstSync() || backup.isEmpty()) { - if (pc.isEmpty() && palm.isEmpty() ) return TQString::null; + if (pc.isEmpty() && palm.isEmpty() ) return TQString(); if(pc.isEmpty()) return palm; if(palm.isEmpty()) return pc; } else { @@ -1512,7 +1512,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString case SyncAction::ePreviousSyncOverrides: return backup; break; default: break; } - return TQString::null; + return TQString(); } @@ -1535,9 +1535,9 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse #define appendGen(desc, abfield, palmfield) \ tab->append(new ResolutionItem(desc, tab->fExistItems, \ - (!pcAddr.isEmpty())?(abfield):(TQString::null), \ - (palmAddr)?(palmAddr->palmfield):(TQString::null), \ - (backupAddr)?(backupAddr->palmfield):(TQString::null) )) + (!pcAddr.isEmpty())?(abfield):(TQString()), \ + (palmAddr)?(palmAddr->palmfield):(TQString()), \ + (backupAddr)?(backupAddr->palmfield):(TQString()) )) #define appendAddr(desc, abfield, palmfield) \ appendGen(desc, abfield, getField(palmfield)) #define appendGenPhone(desc, abfield, palmfield) \ @@ -1588,7 +1588,7 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse tab->fExistItems, !pcAddr.isEmpty() ? KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) : - TQString::null, + TQString(), palmAddrCategoryLabel, backupAddrCategoryLabel)); #undef appendGen @@ -1843,7 +1843,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl; if(!id.isEmpty()) { - Addressee res(aBook->tqfindByUid(id)); + Addressee res(aBook->findByUid(id)); if(!res.isEmpty()) return res; DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl; } diff --git a/conduits/abbrowserconduit/abbrowser-conduit.h b/conduits/abbrowserconduit/abbrowser-conduit.h index 22e9446..464378f 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.h +++ b/conduits/abbrowserconduit/abbrowser-conduit.h @@ -54,6 +54,7 @@ typedef TQValueList<recordid_t> RecordIDList; class AbbrowserConduit : public ConduitAction { Q_OBJECT + TQ_OBJECT public: AbbrowserConduit(KPilotLink *o,const char *n = 0L, const TQStringList &a = TQStringList() ); diff --git a/conduits/abbrowserconduit/abbrowser-setup.cc b/conduits/abbrowserconduit/abbrowser-setup.cc index f4d80d2..b275d3b 100644 --- a/conduits/abbrowserconduit/abbrowser-setup.cc +++ b/conduits/abbrowserconduit/abbrowser-setup.cc @@ -132,7 +132,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup() #endif int fmtindex=fConfigWidget->fCustomDate->currentItem(); AbbrowserSettings::setCustomDateFormat( - (fmtindex==0)?(TQString::null):fConfigWidget->fCustomDate->currentText() ); + (fmtindex==0)?(TQString()):fConfigWidget->fCustomDate->currentText() ); AbbrowserSettings::self()->writeConfig(); unmodified(); diff --git a/conduits/abbrowserconduit/kabcRecord.cc b/conduits/abbrowserconduit/kabcRecord.cc index b713b84..b503031 100644 --- a/conduits/abbrowserconduit/kabcRecord.cc +++ b/conduits/abbrowserconduit/kabcRecord.cc @@ -362,7 +362,7 @@ void KABCSync::setFieldFromHHCustom( bdate = KGlobal::locale()->readDate(value, format, &ok); } DEBUGKPILOT << "Birthdate from " << index << "-th custom field: " - << bdate.toString() << endl; + << TQString(bdate.toString()) << endl; DEBUGKPILOT << "Is Valid: " << bdate.isValid() << endl; if (bdate.isValid()) { @@ -437,7 +437,7 @@ TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, cons case eTTYTTDPhone: return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number(); default: - return TQString::null; + return TQString(); } } diff --git a/conduits/abbrowserconduit/kaddressbookConduit.ui b/conduits/abbrowserconduit/kaddressbookConduit.ui index 169311f..81e5202 100644 --- a/conduits/abbrowserconduit/kaddressbookConduit.ui +++ b/conduits/abbrowserconduit/kaddressbookConduit.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>AbbrowserWidget</class> <author>Adriaan de Groot and David Bishop</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -23,14 +23,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -58,7 +58,7 @@ </size> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>fSyncDestination</cstring> </property> @@ -69,7 +69,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fSyncStdAbook</cstring> </property> @@ -80,7 +80,7 @@ <string><qt>Select this option to synchronize with KDE's standard addressbook (i.e. the addressbook that you edit in KAddressBook, and which you use in KMail)</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>fSyncFile</cstring> </property> @@ -115,7 +115,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>fArchive</cstring> </property> @@ -128,7 +128,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -139,7 +139,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -150,7 +150,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -172,7 +172,7 @@ <string><qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.</qt></string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Use KPilot's Global Setting</string> @@ -218,7 +218,7 @@ <string><qt>Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "Use KPilot's Global Setting" to use the settings defined in KPilot HotSync configuration, "Ask User" to let you decide case by case, "Do Nothing" to allow the entries to be different, "PC overrides", "Handheld overrides", "Use values from last sync" and "Use both entries" to create a new entry on both the PC and handheld.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_7</cstring> </property> @@ -250,7 +250,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -267,7 +267,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -278,7 +278,7 @@ <string><qt>Select which KAddressBook field should be used to store the Pilot's &quot;Other&quot; phone here.</qt></string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Other Phone</string> @@ -334,7 +334,7 @@ <string><qt>Select which KAddressBook field should be used to store the Pilot's &quot;Other&quot; phone here.</qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -345,7 +345,7 @@ <string><qt>Select which KAddressBook field should be used to store the Pilot's Street Address here.</qt></string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Preferred, then Home Address</string> @@ -363,7 +363,7 @@ <string><qt>Select which KAddressBook field should be used to store the Pilot's Street Address here.</qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -374,7 +374,7 @@ <string><qt>Select which KAddressBook field should be used to store the Fax number from the Pilot here.</qt></string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Home Fax</string> @@ -411,7 +411,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -422,7 +422,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -441,7 +441,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.</qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -452,7 +452,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.</qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -463,7 +463,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.</qt></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -474,7 +474,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.</qt></string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Store as Custom Field</string> @@ -510,7 +510,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.</qt></string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Store as Custom Field</string> @@ -546,7 +546,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.</qt></string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Store as Custom Field</string> @@ -582,7 +582,7 @@ <string><qt>Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.</qt></string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>Store as Custom Field</string> @@ -632,7 +632,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="5" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -646,7 +646,7 @@ <string><qt>Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:<br> %d for the day, %m for the month, %y for the two-digit year, %Y for the four-digit year. For example, %d.%m.%Y would generate a date like 27.3.1952, while %m/%d/%y would write the same date as 03/27/52. </qt></string> </property> </widget> - <widget class="QComboBox" row="6" column="1"> + <widget class="TQComboBox" row="6" column="1"> <item> <property name="text"> <string>Locale Settings</string> diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc index d9b7089..0064a68 100644 --- a/conduits/abbrowserconduit/resolutionDialog.cc +++ b/conduits/abbrowserconduit/resolutionDialog.cc @@ -43,15 +43,15 @@ * as well as its child radio buttons. There are two different constructors * for them. * Each controller has three child radio buttons, and if any of them is - * activated (stateChange), it sets the text of its parent (which is the + * activated (stateChange), it sets the text of its tqparent (which is the * controller, which is an instance of ResolutionCheckListItem, too). **/ class ResolutionCheckListItem : TQCheckListItem { public: ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb, - TQListView*parent); + TQListView*tqparent); ResolutionCheckListItem(TQString header, TQString text, - ResolutionCheckListItem*parent); + ResolutionCheckListItem*tqparent); ~ResolutionCheckListItem() {}; virtual void stateChange(bool newstate); virtual void setValue(TQString text); @@ -73,12 +73,12 @@ protected: ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, - ResolutionTable*tb, TQListView*parent) : - TQCheckListItem(parent, TQString::null, TQCheckListItem::Controller), + ResolutionTable*tb, TQListView*tqparent) : + TQCheckListItem(tqparent, TQString(), TQCheckListItem::Controller), fResItem(it), isController(true), - fCaption(it?(it->fName):(TQString::null)), - fText(it?(it->fResolved):(TQString::null)) + fCaption(it?(it->fName):(TQString())), + fText(it?(it->fResolved):(TQString())) { FUNCTIONSETUP; if (it && tb) @@ -119,8 +119,8 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, } ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header, - ResolutionCheckListItem*parent) : - TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton), + ResolutionCheckListItem*tqparent) : + TQCheckListItem(tqparent, TQString(), TQCheckListItem::RadioButton), fResItem(0L), isController(false), fCaption(header), @@ -133,7 +133,7 @@ void ResolutionCheckListItem::stateChange(bool newstate) { if (newstate && !isController) { - ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(parent()); + ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(tqparent()); { par->setValue(fText); } @@ -159,7 +159,7 @@ void ResolutionCheckListItem::setCaption(TQString caption) void ResolutionCheckListItem::updateText() { - TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").arg(fCaption).arg(fText)); + TQString newText(i18n("Entries in the resolution dialog. First the name of the field, then the entry from the Handheld or PC after the colon", "%1: %2").tqarg(fCaption).tqarg(fText)); newText.tqreplace(TQRegExp(CSL1("\n")), i18n("Denoting newlines in Address entries. No need to translate", " | ")); setText(0, newText); @@ -171,9 +171,9 @@ void ResolutionCheckListItem::updateText() * *****************************************************************/ -ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH, +ResolutionDlg::ResolutionDlg( TQWidget* tqparent, KPilotLink*fH, const TQString &caption, const TQString &helpText, ResolutionTable*tab) : - KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), + KDialogBase( tqparent, "ResolutionDlg", false, caption, Apply|Cancel, Apply), tickleTimer(0L), fHandle(fH), fTable(tab) @@ -319,5 +319,5 @@ void ResolutionDlg::_tickle() */ ResolutionDlg::~ResolutionDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/conduits/abbrowserconduit/resolutionDialog.h b/conduits/abbrowserconduit/resolutionDialog.h index 2c7a8b0..68a1d58 100644 --- a/conduits/abbrowserconduit/resolutionDialog.h +++ b/conduits/abbrowserconduit/resolutionDialog.h @@ -40,9 +40,10 @@ class ResolutionTable; class ResolutionDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResolutionDlg( TQWidget* parent=0, + ResolutionDlg( TQWidget* tqparent=0, KPilotLink*fH=0L, const TQString &caption=TQString(), const TQString &helpText=TQString(), diff --git a/conduits/abbrowserconduit/resolutionDialog_base.ui b/conduits/abbrowserconduit/resolutionDialog_base.ui index c561599..5f5442f 100644 --- a/conduits/abbrowserconduit/resolutionDialog_base.ui +++ b/conduits/abbrowserconduit/resolutionDialog_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ResolutionDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>widget2</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fIntroText</cstring> </property> @@ -30,7 +30,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QListView" row="1" column="0"> + <widget class="TQListView" row="1" column="0"> <column> <property name="text"> <string>Field</string> @@ -55,7 +55,7 @@ <string><qt>Use this list to resolve, field by field, the conflicts created when a record was edited both on the handheld and on the PC. For each record, the different values from the last sync, the handheld and PC are displayed for each field, allowing you to choose the desired value.</qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -66,7 +66,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QFrame" row="3" column="0"> + <widget class="TQFrame" row="3" column="0"> <property name="name"> <cstring>frame3</cstring> </property> @@ -77,7 +77,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="1"> + <widget class="TQPushButton" row="0" column="1"> <property name="name"> <cstring>fKeepBoth</cstring> </property> @@ -88,7 +88,7 @@ <string><qt>Click this button to use both values, resulting in the duplication of the record.</qt></string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>fPCValues</cstring> </property> @@ -99,7 +99,7 @@ <string><qt>Click this button to use the PC values for synchronizing all conflicting fields in this record.</qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>fBackupValues</cstring> </property> @@ -110,7 +110,7 @@ <string><qt>Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.</qt></string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>fPalmValues</cstring> </property> diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index cb097d8..06f45b7 100644 --- a/conduits/docconduit/DOC-converter.cc +++ b/conduits/docconduit/DOC-converter.cc @@ -79,7 +79,7 @@ int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) { #endif while (pos >= 0 && found<to) { - pos = doctext.find(pattern, pos); + pos = doctext.tqfind(pattern, pos); #ifdef DEBUG DEBUGKPILOT<<"Result of search: pos="<<pos<<endl; #endif @@ -120,8 +120,8 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks) // TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp) TQString bmkText(bmkName); for (int i=0; i<=rx.numCaptures(); ++i) { - bmkText.tqreplace(CSL1("$%1").arg(i), rx.cap(i)); - bmkText.tqreplace(CSL1("\\%1").arg(i), rx.cap(i)); + bmkText.tqreplace(CSL1("$%1").tqarg(i), rx.cap(i)); + bmkText.tqreplace(CSL1("\\%1").tqarg(i), rx.cap(i)); } fBookmarks.append(new docBookmark(bmkText.left(16), pos)); } @@ -145,7 +145,7 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks) *********************************************************************/ -DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) { +DOCConverter::DOCConverter(TQObject *tqparent, const char *name):TQObject(tqparent,name) { FUNCTIONSETUP; docdb=0L; eSortBookmarks=eSortNone; @@ -195,7 +195,7 @@ TQString DOCConverter::readText() { TQFile docfile(txtfilename); if (!docfile.open(IO_ReadOnly)) { - emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename)); + emit logError(i18n("Unable to open text file %1 for reading.").tqarg(txtfilename)); return TQString(); } @@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() { #endif if (!docdb->isOpen()) { - emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) ); + emit logError(i18n("Unable to open palm doc database %1").tqarg(docdb->dbPathName()) ); return false; } @@ -520,7 +520,7 @@ bool DOCConverter::convertPDBtoTXT() PilotRecord*headerRec = docdb->readRecordByIndex(0); if (!headerRec) { - emit logError(i18n("Unable to read database header for database %1.").arg(docdb->dbPathName())); + emit logError(i18n("Unable to read database header for database %1.").tqarg(docdb->dbPathName())); KPILOT_DELETE(docdb); return false; } @@ -540,7 +540,7 @@ bool DOCConverter::convertPDBtoTXT() TQFile docfile(txtfilename); if (!docfile.open(IO_WriteOnly)) { - emit logError(i18n("Unable to open output file %1.").arg(txtfilename)); + emit logError(i18n("Unable to open output file %1.").tqarg(txtfilename)); KPILOT_DELETE(docdb); return false; } @@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT() DEBUGKPILOT<<"Record "<<i<<endl; KPILOT_DELETE(rec); } else { - emit logMessage(i18n("Could not read text record #%1 from Database %2").arg(i).arg(docdb->dbPathName())); + emit logMessage(i18n("Could not read text record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName())); } } @@ -574,7 +574,7 @@ bool DOCConverter::convertPDBtoTXT() bmks.append(bmk); KPILOT_DELETE(rec); } else { - emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName())); + emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName())); } } // TODO: Sort the list of bookmarks according to their position @@ -592,7 +592,7 @@ bool DOCConverter::convertPDBtoTXT() if (!bmkfile.open(IO_WriteOnly)) { emit logError(i18n("Unable to open file %1 for the bookmarks of %2.") - .arg(bmkfilename).arg(docdb ->dbPathName())); + .tqarg(bmkfilename).tqarg(docdb ->dbPathName())); } else { diff --git a/conduits/docconduit/DOC-converter.h b/conduits/docconduit/DOC-converter.h index 802d60f..27198cb 100644 --- a/conduits/docconduit/DOC-converter.h +++ b/conduits/docconduit/DOC-converter.h @@ -105,6 +105,7 @@ class docRegExpBookmark:public docMatchBookmark { class DOCConverter:public TQObject { Q_OBJECT + TQ_OBJECT private: PilotDatabase * docdb; TQString txtfilename; @@ -121,7 +122,7 @@ public: } eSortBookmarks; public: - DOCConverter(TQObject *parent=0L, const char *name=0L); + DOCConverter(TQObject *tqparent=0L, const char *name=0L); virtual ~ DOCConverter(); TQString readText(); diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index ade1c66..03b83ad 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -19,7 +19,7 @@ bin_PROGRAMS = kpalmdoc libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc doc-setupdialog.ui doc-conflictdialog.cc -conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \ $(LIB_KDEUI) $(LIB_KFILE) diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc index 54f1ab4..0bce0fe 100644 --- a/conduits/docconduit/doc-conduit.cc +++ b/conduits/docconduit/doc-conduit.cc @@ -163,7 +163,7 @@ bool DOCConduit::pcTextChanged(TQString txtfn) KMD5 docmd5; TQFile txtfile(txtfn); if (txtfile.open(IO_ReadOnly)){ - docmd5.update(txtfile); + docmd5.update(*TQT_TQIODEVICE(&txtfile)); TQString thisDigest(docmd5.hexDigest() /* .data() */); #ifdef DEBUG DEBUGKPILOT<<"New digest is "<<thisDigest<<endl; @@ -362,7 +362,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) KMD5 docmd5; TQFile txtfile(docconverter.txtFilename()); if (txtfile.open(IO_ReadOnly)) { - docmd5.update(txtfile); + docmd5.update(*TQT_TQIODEVICE(&txtfile)); TQString thisDigest(docmd5.hexDigest() /* .data() */); DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest); DOCConduitSettings::self()->config()->sync(); @@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) if (!postSyncAction(database, sinfo, res)) emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.") - .arg(TQString::tqfromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") - .arg(TQString::tqfromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); // disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &))); // disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &))); // KPILOT_DELETE(database); @@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) else { emit logError(i18n("Unable to open or create the database %1.") - .arg(TQString::tqfromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); } return res; } @@ -665,7 +665,7 @@ void DOCConduit::syncDatabases() { case eSyncDelete: case eSyncPDAToPC: case eSyncPCToPDA: - emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB)); + emit logMessage(i18n("Synchronizing text \"%1\"").tqarg(sinfo.handheldDB)); if (!doSync(sinfo)) { // The sync could not be done, so inform the user (the error message should probably issued inside doSync) #ifdef DEBUG @@ -716,29 +716,29 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) N N | C P H */ - if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew; - else sinfo.fPCStatus=eStatDoesntExist; - if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew; - else sinfo.fPalmStatus=eStatDoesntExist; + if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew; + else sinfo.fPCtqStatus=eStatDoesntExist; + if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew; + else sinfo.fPalmtqStatus=eStatDoesntExist; KPILOT_DELETE(docdb); switch (eSyncDirection) { case eSyncPDAToPC: - if (sinfo.fPalmStatus==eStatDoesntExist) + if (sinfo.fPalmtqStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPDAToPC; break; case eSyncPCToPDA: - if (sinfo.fPCStatus==eStatDoesntExist) + if (sinfo.fPCtqStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPCToPDA; break; case eSyncNone: // means actually both directions! - if (sinfo.fPCStatus==eStatNew) { - if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict; + if (sinfo.fPCtqStatus==eStatNew) { + if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict; else sinfo.direction=eSyncPCToPDA; } else { - if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC; + if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC; else { sinfo.direction=eSyncNone; #ifdef DEBUG @@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) } // Text was included in the last sync - if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted; + if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted; else if(pcTextChanged(sinfo.txtfilename)) { - sinfo.fPCStatus=eStatChanged; + sinfo.fPCtqStatus=eStatChanged; #ifdef DEBUG DEBUGKPILOT<<"PC side has changed!"<<endl; #endif @@ -769,12 +769,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) #endif } - if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted; + if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted; else if (hhTextChanged(docdb)) { #ifdef DEBUG DEBUGKPILOT<<"Handheld side has changed!"<<endl; #endif - sinfo.fPalmStatus=eStatChanged; + sinfo.fPalmtqStatus=eStatChanged; #ifdef DEBUG } else { DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl; @@ -800,7 +800,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) */ - if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) { + if (sinfo.fPCtqStatus == eStatNone && sinfo.fPalmtqStatus==eStatNone) { #ifdef DEBUG DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl; #endif @@ -813,12 +813,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) // to sync that direction if (eSyncDirection==eSyncPCToPDA) { - if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete; + if (sinfo.fPCtqStatus==eStatDeleted) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPCToPDA; return true; } if (eSyncDirection==eSyncPDAToPC) { - if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete; + if (sinfo.fPalmtqStatus==eStatDeleted) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPDAToPC; return true; } @@ -830,8 +830,8 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) // if either is deleted, and the other is not changed, delete - if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) || - ((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) ) + if ( ((sinfo.fPCtqStatus==eStatDeleted) && (sinfo.fPalmtqStatus!=eStatChanged)) || + ((sinfo.fPalmtqStatus==eStatDeleted) && (sinfo.fPCtqStatus!=eStatChanged)) ) { #ifdef DEBUG DEBUGKPILOT<<"DB was deleted on one side and not changed on " @@ -843,7 +843,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) // eStatDeleted (and both not changed) have already been treated, for all // other values in combination with eStatNone, just copy the texts. - if (sinfo.fPCStatus==eStatNone) { + if (sinfo.fPCtqStatus==eStatNone) { #ifdef DEBUG DEBUGKPILOT<<"PC side has changed!"<<endl; #endif @@ -851,7 +851,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) return true; } - if (sinfo.fPalmStatus==eStatNone) { + if (sinfo.fPalmtqStatus==eStatNone) { sinfo.direction=eSyncPCToPDA; return true; } diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h index f3429bb..7b50adc 100644 --- a/conduits/docconduit/doc-conduit.h +++ b/conduits/docconduit/doc-conduit.h @@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum { eSyncDelete, eSyncConflict }; -typedef enum eTexStatus { +typedef enum eTextqStatus { eStatNone=0, eStatNew=1, eStatChanged=2, @@ -55,6 +55,7 @@ TQString dirToString(eSyncDirectionEnum dir); class DOCConduit:public ConduitAction { Q_OBJECT + TQ_OBJECT public: eSyncDirectionEnum eSyncDirection; @@ -138,14 +139,14 @@ public: txtfilename=txtfn; pdbfilename=pdbfn; direction=dir; - fPCStatus=eStatNone; - fPalmStatus=eStatNone; + fPCtqStatus=eStatNone; + fPalmtqStatus=eStatNone; }; ~docSyncInfo(){}; TQString handheldDB, txtfilename, pdbfilename; DBInfo dbinfo; eSyncDirectionEnum direction; - eTexStatus fPCStatus, fPalmStatus; + eTextqStatus fPCtqStatus, fPalmtqStatus; }; diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc index 7b19586..5ea646b 100644 --- a/conduits/docconduit/doc-conflictdialog.cc +++ b/conduits/docconduit/doc-conflictdialog.cc @@ -39,8 +39,8 @@ #include <tqscrollview.h> -ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) - : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { +ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) + : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { FUNCTIONSETUP; syncInfo=sinfo; hasConflicts=false; @@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 ); - resolutionGroupBoxLayout->tqsetAlignment( Qt::AlignTop ); + resolutionGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); // Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f) TQButtonGroup *bgroup = new TQButtonGroup( this ); @@ -138,7 +138,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s */ ResolutionDialog::~ResolutionDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } /* virtual slot */ void ResolutionDialog::slotOk() { @@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog() KDialogBase::slotOk(); } -TQString eTexStatusToString(eTexStatus stat) { +TQString eTexStatusToString(eTextqStatus stat) { switch(stat) { case eStatNone: return i18n("unchanged"); case eStatNew: return i18n("new"); @@ -168,9 +168,9 @@ void ResolutionDialog::slotInfo(int index) { int ix=cE.index; if (!syncInfo) return; docSyncInfo si=(*syncInfo)[ix]; - TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); - text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus)); - text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus)); + TQString text=i18n("tqStatus of the database %1:\n\n").tqarg(si.handheldDB); + text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus)); + text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus)); KMessageBox::information(this, text, i18n("Database information")); } diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h index f0c8b21..83cb8d4 100644 --- a/conduits/docconduit/doc-conflictdialog.h +++ b/conduits/docconduit/doc-conflictdialog.h @@ -54,9 +54,10 @@ typedef struct conflictEntry { class ResolutionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); + ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L); ~ResolutionDialog(); bool hasConflicts; diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc index cfab20f4d..47e1d40 100644 --- a/conduits/docconduit/doc-factory.cc +++ b/conduits/docconduit/doc-factory.cc @@ -94,7 +94,7 @@ DOCConduitFactory::~DOCConduitFactory() } else { - WARNINGKPILOT << "Couldn't cast parent to widget." << endl; + WARNINGKPILOT << "Couldn't cast tqparent to widget." << endl; return 0L; } } @@ -107,7 +107,7 @@ DOCConduitFactory::~DOCConduitFactory() } else { - WARNINGKPILOT << "Couldn't cast parent to KPilotLink" <<endl; + WARNINGKPILOT << "Couldn't cast tqparent to KPilotLink" <<endl; return 0L; } } diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h index 312b9de..d1e0d72 100644 --- a/conduits/docconduit/doc-factory.h +++ b/conduits/docconduit/doc-factory.h @@ -37,9 +37,9 @@ class KAboutData; class DOCConduitFactory:public KLibFactory { - -Q_OBJECT - + Q_OBJECT + TQ_OBJECT + public: DOCConduitFactory(TQObject * = 0L, const char * = 0L); virtual ~ DOCConduitFactory(); @@ -55,9 +55,9 @@ public: protected: - virtual TQObject * createObject(TQObject * parent = 0, + virtual TQObject * createObject(TQObject * tqparent = 0, const char *name = 0, - const char *classname = "TQObject", + const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList & args = TQStringList()); private: diff --git a/conduits/docconduit/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui index f9bccb8..c2fc82b 100644 --- a/conduits/docconduit/doc-setupdialog.ui +++ b/conduits/docconduit/doc-setupdialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DOCWidget</class> <author>Reinhold Kainhofer</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -31,11 +31,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -60,7 +60,7 @@ <string><qt>Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.</qt></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>fkeepPDBLocally</cstring> </property> @@ -82,7 +82,7 @@ <string><qt>Enter here, or select clicking the file picker button, the name and location of the folder used to find and synchronize text files. All files with extension .txt located in this folder will be synced to Palm DOC databases in your handheld.</qt></string> </property> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fSyncDirection</cstring> </property> @@ -99,7 +99,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>RadioButton3</cstring> </property> @@ -113,7 +113,7 @@ <string><qt>Select this option to synchronize texts changed in your PC to Palm DOC databases in your handheld. Palm DOC databases modified in the handheld will not be converted to text files, but texts changed in the PC will be converted to the Palm DOC databases.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioButton2</cstring> </property> @@ -124,7 +124,7 @@ <string><qt>Select this option to synchronize the changes made to Palm DOC databases in your handheld to the PC text files. Palm DOC databases modified in the handheld will be converted to text files, but texts changed in the PC will not be converted to the Palm DOC databases.</qt></string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -170,7 +170,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -181,7 +181,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>fCompress</cstring> </property> @@ -198,7 +198,7 @@ <string><qt>The Palm DOC format supports compressing the text to save memory. Check this box to enable text compression, so the resulting Palm DOC database will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.</qt></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>fConvertBookmarks</cstring> </property> @@ -229,7 +229,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>fBookmarksInline</cstring> </property> @@ -243,7 +243,7 @@ <string>Check this box to create bookmarks from inline tags in the text. The inline tag consist of tags in the form <* bookmarktext *>. The bookmark location is set using the location of the inline tag in the text, and the name is the text between the <* and the *>. The inline tag (<*...*>) will be removed from the text.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -254,7 +254,7 @@ <cstring>fEncoding</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>fBookmarksEndtags</cstring> </property> @@ -265,7 +265,7 @@ <string>Check this box to convert tags of the form <bookmarkname> at the end of the text to bookmarks. The text inside the tag ("bookmarkname") will be searched in the text, and whenever found, a bookmark will be set there. The endtags <...> will then be removed from the end of the text.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>fBookmarksBmk</cstring> </property> @@ -276,14 +276,14 @@ <string><qt>Check this box to use regular expressions in a file to search the text for bookmarks. The file should have the same name as the text file, but should end in .bmk instead of .txt (for instance, the regular expression file for textname.txt should be textname.bmk). See the documentation for a description of the format of the bmk file.</qt></string> </property> </widget> - <widget class="QComboBox" row="5" column="1"> + <widget class="TQComboBox" row="5" column="1"> <property name="name"> <cstring>fEncoding</cstring> </property> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -311,7 +311,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>fNoConversionOfBmksOnly</cstring> </property> @@ -322,7 +322,7 @@ <string><qt>Check this box to avoid syncing the text on the handheld to the PC if you only changed the bookmarks on the handheld (but not the text).</qt></string> </property> </widget> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>fPCBookmarks</cstring> </property> @@ -333,7 +333,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioButton8</cstring> </property> @@ -347,7 +347,7 @@ <string><qt>Check this box to avoid converting Palm DOC bookmarks to inline tags or to a bookmark file.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioButton11</cstring> </property> @@ -364,7 +364,7 @@ <string><qt>Check this box to convert the Palm DOC database bookmarks to a separate file, in the bmk format (see more about this format in the documentation). The resulting bookmark file shares the same filename as the resulting .txt file, but ends in .bmk instead. This approach creates a clean text file and a bookmark file.</qt></string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioButton9</cstring> </property> @@ -382,7 +382,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -393,7 +393,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>fConflictResolution</cstring> </property> @@ -410,7 +410,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioButton12</cstring> </property> @@ -424,7 +424,7 @@ <string><qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to prevent KPilot from overwriting your modifications.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioButton5</cstring> </property> @@ -438,7 +438,7 @@ <string><qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PDA version overwrite the PC version in case of conflict.</qt></string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>RadioButton4</cstring> </property> @@ -452,7 +452,7 @@ <string><qt>The Palm DOC conduit does not feature merging the modifications when a text is changed both in the handheld and in the computer. Therefore, when conflicts appear, the choice is between working with the files out of sync, or discarding the changes in one of them. Select this option to make the PC version overwrite the PDA version in case of conflict.</qt></string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>RadioButton7</cstring> </property> @@ -471,7 +471,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>fAlwaysUseResolution</cstring> </property> diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index f73e392..0958c17 100644 --- a/conduits/docconduit/kpalmdoc_dlg.cc +++ b/conduits/docconduit/kpalmdoc_dlg.cc @@ -54,8 +54,8 @@ #include "kpalmdocSettings.h" -ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) - : KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1, +ConverterDlg::ConverterDlg( TQWidget *tqparent, const TQString& caption) + : KDialogBase( tqparent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1, KDialogBase::Close, true, i18n("&About")) { TQWidget *page = makeHBoxMainWidget(); @@ -78,7 +78,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) ConverterDlg::~ConverterDlg() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void ConverterDlg::writeSettings() { @@ -175,8 +175,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." - "<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + "<br>Use folder <em>%2</em> instead?</qt>").tqarg(pdburl) + .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); @@ -191,7 +191,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " "the handheld database files is not a valid " - "folder.</qt>").arg(pdburl)); + "folder.</qt>").tqarg(pdburl)); return; } @@ -200,7 +200,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " "the handheld database files is not a " - "valid directory.</qt>").arg(pdburl)); + "valid directory.</qt>").tqarg(pdburl)); return; } @@ -211,8 +211,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." - "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl) + .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); txtinfo.setFile(txturl); @@ -227,7 +227,7 @@ void ConverterDlg::slotToText() if (!txtinfo.isDir()) { KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " - "the text files could not be created.</qt>").arg(txturl)); + "the text files could not be created.</qt>").tqarg(txturl)); return; } @@ -265,7 +265,7 @@ void ConverterDlg::slotToText() if (!pdbinfo.isFile() || !pdbinfo.exists()) { KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " - "exist.</qt>").arg(pdburl)); + "exist.</qt>").tqarg(pdburl)); return; } @@ -274,13 +274,13 @@ void ConverterDlg::slotToText() if (!txtinfo.isFile()) { KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the " - "text is not a valid filename.</qt>").arg(txturl)); + "text is not a valid filename.</qt>").tqarg(txturl)); return; }*/ if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(), txtinfo.dirPath(true), txtinfo.fileName(), &conv) ) { - KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl)); + KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(pdburl)); } } @@ -324,8 +324,8 @@ void ConverterDlg::slotToPDB() int res=KMessageBox::questionYesNo(this, i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." - "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl) + .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); @@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB() { KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " - "the text files is not a valid folder.</qt>").arg(txturl)); + "the text files is not a valid folder.</qt>").tqarg(txturl)); return; } @@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB() i18n("<qt>You selected to sync folders, " "but gave a filename instead (<em>%1</em>)." "<br>Use folder <em>%2</em> instead?</qt>") - .arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); + .tqarg(pdburl) + .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); pdbinfo.setFile(pdburl); @@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB() } if (!pdbinfo.isDir()) { KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " - "the PalmDOC files could not be created.</qt>").arg(pdburl)); + "the PalmDOC files could not be created.</qt>").tqarg(pdburl)); return; } @@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB() if (!txtinfo.isFile() || !txtinfo.exists()) { KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " - "exist.</qt>").arg(txturl)); + "exist.</qt>").tqarg(txturl)); return; } if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(), pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) ) { - KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl)); + KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(txturl)); } } @@ -454,7 +454,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, if (!dbfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>") - .arg(dbfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .tqarg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) { PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) @@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, } if ( !res && verbose ) { - KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(txtfile)); + KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(txtfile)); } } else @@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, if (!txtfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>") - .arg(txtfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .tqarg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) { PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) @@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, } if ( !res && verbose ) { - KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(pdbfile)); + KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(pdbfile)); } } else diff --git a/conduits/docconduit/kpalmdoc_dlg.h b/conduits/docconduit/kpalmdoc_dlg.h index 5e9202b..6fe6e57 100644 --- a/conduits/docconduit/kpalmdoc_dlg.h +++ b/conduits/docconduit/kpalmdoc_dlg.h @@ -35,9 +35,10 @@ class DOCConverter; class ConverterDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConverterDlg( TQWidget *parent=0, const TQString& caption=0); + ConverterDlg( TQWidget *tqparent=0, const TQString& caption=0); ~ConverterDlg(); protected slots: diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui index ee2bd2a..2b5b581 100644 --- a/conduits/docconduit/kpalmdoc_dlgbase.ui +++ b/conduits/docconduit/kpalmdoc_dlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConverterDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConverterDlgBase</cstring> </property> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>fPdbLabel</cstring> </property> @@ -50,7 +50,7 @@ <cstring>fPDBDir</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fTextLabel</cstring> </property> @@ -69,7 +69,7 @@ <cstring>fTXTDir</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>fDirectories</cstring> </property> @@ -85,7 +85,7 @@ <string>Folder where copies of the handheld databases are kept. You can install them to any PalmOS handheld, and distribute these copies to other people (but beware of copyright infringement).</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>fAskOverwrite</cstring> </property> @@ -93,7 +93,7 @@ <string>&Ask before overwriting files</string> </property> </widget> - <widget class="QCheckBox" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>fVerbose</cstring> </property> @@ -142,12 +142,12 @@ <string>Enter the name of the folder where the text files reside on the PC. All files with extension .txt will be synced to the handheld.</string> </property> </widget> - <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="5" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>fEncoding</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -160,7 +160,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -222,7 +222,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>fBookmarksInline</cstring> </property> @@ -236,7 +236,7 @@ <string>When a <* bookmarktext *> appears somewhere in the text, a bookmark will be set at this position, and the text between the <* and the *> will be used as bookmark name. The <*...*> will be removed from the text.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>fBookmarksEndtags</cstring> </property> @@ -247,7 +247,7 @@ <string>Tags of the form <bookmarkname> at the end of the text will be used to search the text for the pattern between the < and >. Whenever "bookmarkname" appears in the text, a bookmark will be set there. The endtags <...> will then be removed from the end of the text.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fCompress</cstring> </property> @@ -264,7 +264,7 @@ <string>The Palm doc format supports compressing the text to save memory. If you check this box, the text will consume about 50% less memory than in uncompressed state. Almost all DOC readers on the Palm support compressed texts.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fConvertBookmarks</cstring> </property> @@ -278,7 +278,7 @@ <string>Do you want to convert bookmarks? Most doc readers support bookmarks. You have to provide some information about where the bookmarks should be set and their titles. Check at least one of the bookmark types below.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>fBookmarksBmk</cstring> </property> @@ -308,7 +308,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -336,7 +336,7 @@ </size> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>fPCBookmarks</cstring> </property> @@ -347,7 +347,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioButton9</cstring> </property> @@ -361,7 +361,7 @@ <number>1</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioButton8</cstring> </property> @@ -375,7 +375,7 @@ <number>0</number> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioButton10</cstring> </property> @@ -386,7 +386,7 @@ <string>Convert as &end tags</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>radioButton11</cstring> </property> diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am index b13a2ff..3161798 100644 --- a/conduits/knotes/Makefile.am +++ b/conduits/knotes/Makefile.am @@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \ knotes-action.cc \ setup_base.ui -conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = knotesconduit.kcfg diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index 26b595e..e29dedc 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -79,7 +79,7 @@ public: int memo() const { return memoId; } ; KNoteID_t note() const { return noteId; } ; inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ; - TQString toString() const { return CSL1("<%1,%2>").arg(noteId).arg(memoId); } ; + TQString toString() const { return CSL1("<%1,%2>").tqarg(noteId).tqarg(memoId); } ; static NoteAndMemo findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note); static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo); @@ -234,7 +234,7 @@ KNotesAction::KNotesAction(KPilotLink *o, } fP->fTimer = new TQTimer(this); - fActionStatus = Init; + fActiontqStatus = Init; // this is not needed. As it is done in the initstate in process(); // resetIndexes(); @@ -269,7 +269,7 @@ bool KNotesAction::openKNotesResource() } else { - emit logError( i18n("Could not load the resource at: %1").arg(mURL.path()) ); + emit logError( i18n("Could not load the resource at: %1").tqarg(mURL.path()) ); return false; } } @@ -308,9 +308,9 @@ void KNotesAction::listNotes() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; - switch(fActionStatus) + switch(fActiontqStatus) { case Init: resetIndexes(); @@ -321,16 +321,16 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eBackup: case SyncAction::SyncMode::eRestore: // Impossible! - fActionStatus = Done; + fActiontqStatus = Done; break; case SyncAction::SyncMode::eCopyHHToPC : listNotes(); // Debugging - fActionStatus = MemosToKNotes; + fActiontqStatus = MemosToKNotes; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: case SyncAction::SyncMode::eCopyPCToHH: - fActionStatus = ModifiedNotesToPilot; + fActiontqStatus = ModifiedNotesToPilot; break; } break; @@ -338,14 +338,14 @@ void KNotesAction::listNotes() if (modifyNoteOnPilot()) { resetIndexes(); - fActionStatus = DeleteNotesOnPilot; + fActiontqStatus = DeleteNotesOnPilot; } break; case DeleteNotesOnPilot: if (deleteNoteOnPilot()) { resetIndexes(); - fActionStatus = NewNotesToPilot; + fActiontqStatus = NewNotesToPilot; } break; case NewNotesToPilot : @@ -359,14 +359,14 @@ void KNotesAction::listNotes() case SyncAction::SyncMode::eRestore: case SyncAction::SyncMode::eCopyHHToPC : // Impossible! - fActionStatus = Done; + fActiontqStatus = Done; break; case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eFullSync: - fActionStatus = MemosToKNotes; + fActiontqStatus = MemosToKNotes; break; case SyncAction::SyncMode::eCopyPCToHH: - fActionStatus = Cleanup; + fActiontqStatus = Cleanup; break; } } @@ -374,7 +374,7 @@ void KNotesAction::listNotes() case MemosToKNotes : if (syncMemoToKNotes()) { - fActionStatus=Cleanup; + fActiontqStatus=Cleanup; } break; case Cleanup : @@ -791,7 +791,7 @@ void KNotesAction::cleanupMemos() KNotesConduitSettings::setMemoIds(memos); KNotesConduitSettings::self()->writeConfig(); - fActionStatus=Done; + fActiontqStatus=Done; fDatabase->cleanup(); fDatabase->resetSyncFlags(); fLocalDatabase->cleanup(); @@ -848,23 +848,23 @@ void KNotesAction::cleanupMemos() /* virtual */ TQString KNotesAction::statusString() const { - switch(fActionStatus) + switch(fActiontqStatus) { case Init : return CSL1("Init"); case NewNotesToPilot : return CSL1("NewNotesToPilot key=%1"); - // TODO DCOP_REMOVAL .arg(fP->fIndex.key()); + // TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); case ModifiedNotesToPilot : return CSL1("ModifiedNotesToPilot key=%1"); - //TODO DCOP_REMOVAL .arg(fP->fIndex.key()); + //TODO DCOP_REMOVAL .tqarg(fP->fIndex.key()); case MemosToKNotes : return CSL1("MemosToKNotes rec=%1") - .arg(fP->fRecordIndex); + .tqarg(fP->fRecordIndex); case Cleanup : return CSL1("Cleanup"); case Done : return CSL1("Done"); default : - return CSL1("Unknown (%1)").arg(fActionStatus); + return CSL1("Unknown (%1)").tqarg(fActiontqStatus); } } diff --git a/conduits/knotes/knotes-action.h b/conduits/knotes/knotes-action.h index eb490e0..223dfe2 100644 --- a/conduits/knotes/knotes-action.h +++ b/conduits/knotes/knotes-action.h @@ -37,6 +37,7 @@ class PilotMemo; class KNotesAction : public ConduitAction { Q_OBJECT + TQ_OBJECT public: KNotesAction( KPilotLink *o, @@ -44,7 +45,7 @@ public: const TQStringList &a = TQStringList() ); virtual ~KNotesAction(); - enum Status { Init, + enum tqStatus { Init, ModifiedNotesToPilot, DeleteNotesOnPilot, NewNotesToPilot, diff --git a/conduits/knotes/knotes-factory.cc b/conduits/knotes/knotes-factory.cc index 9601e81..0abc76a 100644 --- a/conduits/knotes/knotes-factory.cc +++ b/conduits/knotes/knotes-factory.cc @@ -123,7 +123,7 @@ KNotesConduitFactory::~KNotesConduitFactory() else { WARNINGKPILOT - << "Couldn't cast parent to KPilotDeviceLink" + << "Couldn't cast tqparent to KPilotDeviceLink" << endl; return 0L; } diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h index 02b0f61..b8c8311 100644 --- a/conduits/knotes/knotes-factory.h +++ b/conduits/knotes/knotes-factory.h @@ -37,6 +37,7 @@ class KAboutData; class KNotesConduitFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KNotesConduitFactory(TQObject * = 0L,const char * = 0L); @@ -50,9 +51,9 @@ public: // break its value. We store group and entry keys in here. protected: - virtual TQObject* createObject( TQObject* parent = 0, + virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, - const char* classname = "TQObject", + const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: KInstance *fInstance; diff --git a/conduits/knotes/knotes-setup.h b/conduits/knotes/knotes-setup.h index 652f222..96f008c 100644 --- a/conduits/knotes/knotes-setup.h +++ b/conduits/knotes/knotes-setup.h @@ -36,7 +36,7 @@ class KNotesWidget; class KNotesConfigBase : public ConduitConfigBase { public: - KNotesConfigBase(TQWidget *parent, const char *name); + KNotesConfigBase(TQWidget *tqparent, const char *name); virtual void commit(); virtual void load(); diff --git a/conduits/knotes/setup_base.ui b/conduits/knotes/setup_base.ui index 6e0fe44..b2007b8 100644 --- a/conduits/knotes/setup_base.ui +++ b/conduits/knotes/setup_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KNotesWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KNotesWidget</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>fDeleteNoteForMemo</cstring> </property> @@ -51,7 +51,7 @@ <string><qt>Check this box if you wish to delete notes from KNotes automatically when the corresponding Pilot memo is deleted. Use this option with care, as the notes you want to keep in the handheld and in the desktop are not necessarily the same.</qt></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>fSuppressConfirm</cstring> </property> diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am index df5ed04..081d129 100644 --- a/conduits/malconduit/Makefile.am +++ b/conduits/malconduit/Makefile.am @@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg kde_module_LTLIBRARIES = conduit_mal.la conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cc mal-setup.cc mal-conduit.cc -conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI) diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc index 2d3344f..10f1352 100644 --- a/conduits/malconduit/mal-conduit.cc +++ b/conduits/malconduit/mal-conduit.cc @@ -217,7 +217,7 @@ bool MALConduit::skip() syncMessage = i18n("No proxy server is set."); break; } - syncMessage = i18n("Using proxy server: %1").arg(proxyServer); + syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer); #ifdef DEBUG DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<< @@ -259,7 +259,7 @@ bool MALConduit::skip() syncMessage = i18n("No SOCKS proxy is set."); break; } - syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer); + syncMessage = i18n("Using SOCKS proxy: %1").tqarg(proxyServer); #ifdef DEBUG DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl; #endif diff --git a/conduits/malconduit/mal-conduit.h b/conduits/malconduit/mal-conduit.h index 3f5c14a..46e5551 100644 --- a/conduits/malconduit/mal-conduit.h +++ b/conduits/malconduit/mal-conduit.h @@ -38,6 +38,7 @@ class MALConduit : public ConduitAction { Q_OBJECT + TQ_OBJECT public: MALConduit( KPilotLink *o, diff --git a/conduits/malconduit/mal-factory.cc b/conduits/malconduit/mal-factory.cc index 3e363d2..3206822 100644 --- a/conduits/malconduit/mal-factory.cc +++ b/conduits/malconduit/mal-factory.cc @@ -115,7 +115,7 @@ MALConduitFactory::~MALConduitFactory() else { WARNINGKPILOT - << "Couldn't cast parent to widget." + << "Couldn't cast tqparent to widget." << endl; return 0L; } @@ -132,7 +132,7 @@ MALConduitFactory::~MALConduitFactory() else { WARNINGKPILOT - << "Couldn't cast parent to KPilotLink" + << "Couldn't cast tqparent to KPilotLink" << endl; return 0L; } diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h index a153163..7db6bb6 100644 --- a/conduits/malconduit/mal-factory.h +++ b/conduits/malconduit/mal-factory.h @@ -40,6 +40,7 @@ class KAboutData; class MALConduitFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: MALConduitFactory(TQObject * = 0L,const char * = 0L); @@ -48,9 +49,9 @@ public: static KAboutData *about() { return fAbout; } ; protected: - virtual TQObject* createObject( TQObject* parent = 0, + virtual TQObject* createObject( TQObject* tqparent = 0, const char* name = 0, - const char* classname = "TQObject", + const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: KInstance *fInstance; diff --git a/conduits/malconduit/mal-setup.cc b/conduits/malconduit/mal-setup.cc index 1d1f89f..61441f0 100644 --- a/conduits/malconduit/mal-setup.cc +++ b/conduits/malconduit/mal-setup.cc @@ -150,7 +150,7 @@ MALWidgetSetup::~MALWidgetSetup() fConfigWidget->proxyCustomPort->setValue(proxyPortNr); } fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser()); - fConfigWidget->proxyPassword->setText(TQString::null); + fConfigWidget->proxyPassword->setText(TQString()); fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword()); #ifdef DEBUG diff --git a/conduits/malconduit/mal-setup.h b/conduits/malconduit/mal-setup.h index 6a63374..6114c28 100644 --- a/conduits/malconduit/mal-setup.h +++ b/conduits/malconduit/mal-setup.h @@ -40,6 +40,7 @@ class MALWidget; class MALWidgetSetup : public ConduitConfigBase { Q_OBJECT + TQ_OBJECT public: MALWidgetSetup(TQWidget *,const char *); virtual ~MALWidgetSetup(); diff --git a/conduits/malconduit/mal-setup_dialog.ui b/conduits/malconduit/mal-setup_dialog.ui index 645335b..2bc4c5e 100644 --- a/conduits/malconduit/mal-setup_dialog.ui +++ b/conduits/malconduit/mal-setup_dialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MALWidget</class> <author>Reinhold Kainhofer</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MalWidget</cstring> </property> @@ -23,14 +23,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> <property name="enabled"> <bool>true</bool> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>syncTime</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -78,7 +78,7 @@ <string><qt>Select this option to synchronize with the MAL server on every HotSync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -92,7 +92,7 @@ <string><qt>Select this option to synchronize with the MAL server on every HotSync that is at least one hour after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt></string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>RadioButton1_3</cstring> </property> @@ -103,7 +103,7 @@ <string><qt>Select this option to synchronize with the MAL server on every HotSync that is at least one day after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt></string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>RadioButton1_4</cstring> </property> @@ -114,7 +114,7 @@ <string><qt>Select this option to synchronize with the MAL server on every HotSync that is at least one week after the previous MAL sync. To perform a successful synchronization, you need to have access to the MAL server during the HotSync.</qt></string> </property> </widget> - <widget class="QRadioButton" row="4" column="0"> + <widget class="TQRadioButton" row="4" column="0"> <property name="name"> <cstring>RadioButton1_5</cstring> </property> @@ -146,7 +146,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -157,7 +157,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>proxyType</cstring> </property> @@ -177,7 +177,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton8</cstring> </property> @@ -191,7 +191,7 @@ <string><qt>Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.</qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton8_2</cstring> </property> @@ -202,7 +202,7 @@ <string><qt>Select this option if you want KPilot to use a HTTP proxy.</qt></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton8_2_2</cstring> </property> @@ -215,7 +215,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>proxyServerInformation</cstring> </property> @@ -252,7 +252,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>proxyCustomPortCheck</cstring> </property> @@ -263,7 +263,7 @@ <string>Check this box to use a non-standard proxy port.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -316,7 +316,7 @@ <string><qt>If your proxy requires authentication, enter your password here.</qt></string> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>proxyUserName</cstring> </property> @@ -324,7 +324,7 @@ <string><qt>If your proxy requires authentication, enter your username here.</qt></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -335,7 +335,7 @@ <cstring>proxyPassword</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -363,7 +363,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>proxyExclude</cstring> </property> @@ -371,7 +371,7 @@ <string><qt>Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: <br><i>localhost,127.0.0.1,.lan</i><qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -406,7 +406,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -423,7 +423,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>GroupBox1_2</cstring> </property> @@ -443,7 +443,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -454,7 +454,7 @@ <cstring>malServerName</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>malCustomPortCheck</cstring> </property> @@ -501,12 +501,12 @@ <cstring>malServerName</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>malUserName</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> @@ -517,7 +517,7 @@ <cstring>malPassword</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel</cstring> </property> @@ -566,7 +566,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am index 1f51105..020c569 100644 --- a/conduits/memofileconduit/Makefile.am +++ b/conduits/memofileconduit/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc -conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE) kde_kcfg_DATA = memofileconduit.kcfg diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 954af38..233f6af 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -31,7 +31,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // @@ -120,7 +120,7 @@ MemofileConduit::~MemofileConduit() fCtrPC->setStartCount(_memofiles->count()); setFirstSync( _memofiles->isFirstSync() ); - addSyncLogEntry(i18n(" Syncing with %1.").arg(_memo_directory)); + addSyncLogEntry(i18n(" Syncing with %1.").tqarg(_memo_directory)); if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) { addSyncLogEntry(i18n(" Copying Pilot to PC...")); @@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot() { FUNCTIONSETUP; - DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; + DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl; } @@ -448,7 +448,7 @@ void MemofileConduit::deleteUnsyncedHHRecords() Pilot::RecordIDList::iterator it; for ( it = ids.begin(); it != ids.end(); ++it ) { - if (!_memofiles->find(*it)) + if (!_memofiles->tqfind(*it)) { DEBUGKPILOT << fname << "Deleting record with ID "<< *it <<" from handheld " diff --git a/conduits/memofileconduit/memofile-conduit.h b/conduits/memofileconduit/memofile-conduit.h index c795066..d2d07d1 100644 --- a/conduits/memofileconduit/memofile-conduit.h +++ b/conduits/memofileconduit/memofile-conduit.h @@ -37,6 +37,7 @@ class PilotMemo; class MemofileConduit : public ConduitAction { Q_OBJECT + TQ_OBJECT public: MemofileConduit(KPilotLink *, const char *name=0L, @@ -52,8 +53,8 @@ protected slots: private: // configuration settings... - QString _DEFAULT_MEMODIR; - QString _memo_directory; + TQString _DEFAULT_MEMODIR; + TQString _memo_directory; bool _sync_private; PilotMemoInfo *fMemoAppInfo; diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc index 795edc3..8b2d9df 100644 --- a/conduits/memofileconduit/memofile-factory.cc +++ b/conduits/memofileconduit/memofile-factory.cc @@ -46,7 +46,7 @@ class MemofileConduitConfig : public ConduitConfigBase { public: - MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L); + MemofileConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/memofileconduit/memofile.h b/conduits/memofileconduit/memofile.h index 4bd5fb7..1308e98 100644 --- a/conduits/memofileconduit/memofile.h +++ b/conduits/memofileconduit/memofile.h @@ -32,7 +32,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi index 33ff89f..9088d35 100644 --- a/conduits/memofileconduit/memofileconduit.xmi +++ b/conduits/memofileconduit/memofileconduit.xmi @@ -34,7 +34,7 @@ <UML:Operation visibility="protected" xmi.id="28" type="void" name="process" /> <UML:Operation visibility="private" xmi.id="43" type="bool" name="readConfig" /> <UML:Operation visibility="private" xmi.id="44" type="void" name="getAppInfo" /> - <UML:Operation visibility="private" xmi.id="45" type="QString" name="getCategoryName" > + <UML:Operation visibility="private" xmi.id="45" type=TQSTRING_OBJECT_NAME_STRING name="getCategoryName" > <UML:Parameter visibility="public" xmi.id="46" value="" type="int" name="category" /> </UML:Operation> <UML:Operation visibility="private" xmi.id="47" type="bool" name="initializeFromPilot" /> @@ -43,7 +43,7 @@ <UML:Operation visibility="private" xmi.id="50" type="bool" name="initializeFromFilesystem" /> <UML:Operation visibility="private" xmi.id="51" type="bool" name="initializeMemofileList" /> <UML:Operation visibility="private" xmi.id="52" type="bool" name="checkDirectory" > - <UML:Parameter visibility="public" xmi.id="53" value="" type="QString" name="dir" /> + <UML:Parameter visibility="public" xmi.id="53" value="" type=TQSTRING_OBJECT_NAME_STRING name="dir" /> </UML:Operation> <UML:Operation visibility="private" xmi.id="54" type="bool" name="ensureFilesystemReady" /> <UML:Operation visibility="private" xmi.id="55" type="bool" name="copyHHToPC" /> @@ -54,8 +54,8 @@ <UML:Parameter visibility="public" xmi.id="60" value="" type="const QString&" name="fileName" /> <UML:Parameter visibility="public" xmi.id="61" value="" type="Memofile*" name="theMemo" /> </UML:Operation> - <UML:Attribute visibility="private" xmi.id="29" value="" type="QString" name="_DEFAULT_MEMODIR" /> - <UML:Attribute visibility="private" xmi.id="30" value="" type="QString" name="_memo_directory" /> + <UML:Attribute visibility="private" xmi.id="29" value="" type=TQSTRING_OBJECT_NAME_STRING name="_DEFAULT_MEMODIR" /> + <UML:Attribute visibility="private" xmi.id="30" value="" type=TQSTRING_OBJECT_NAME_STRING name="_memo_directory" /> <UML:Attribute visibility="private" xmi.id="31" value="" type="bool" name="_sync_private" /> <UML:Attribute visibility="private" xmi.id="32" value="" type="QPtrList< PilotMemo >" name="fMemoList" /> <UML:Attribute visibility="private" xmi.id="33" value="" type="struct MemoAppInfo" name="fMemoAppInfo" /> @@ -65,7 +65,7 @@ <UML:Attribute visibility="private" xmi.id="40" value="" type="int" name="fCounter" /> <UML:Attribute visibility="private" xmi.id="41" value="" type="int" name="fDeleteCounter" /> <UML:Attribute visibility="private" xmi.id="42" value="" type="int" name="fModifyCounter" /> - <UML:Enumeration stereotype="18" visibility="public" xmi.id="17" name="Status" > + <UML:Enumeration stereotype="18" visibility="public" xmi.id="17" name="tqStatus" > <UML:EnumerationLiteral visibility="public" xmi.id="19" name="Init" /> <UML:EnumerationLiteral visibility="public" xmi.id="20" name="ModifiedFilesToPilot" /> <UML:EnumerationLiteral visibility="public" xmi.id="21" name="DeleteFilesOnPilot" /> @@ -79,7 +79,7 @@ <UML:Class visibility="public" xmi.id="63" name="Memofiles" > <UML:Operation visibility="public" xmi.id="80" type="Memofiles" name="Memofiles" > <UML:Parameter visibility="public" xmi.id="81" value="" type="QMap" name="categories" /> - <UML:Parameter visibility="public" xmi.id="82" value="" type="QString" name="baseDirectory" /> + <UML:Parameter visibility="public" xmi.id="82" value="" type=TQSTRING_OBJECT_NAME_STRING name="baseDirectory" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="87" type="void" name="load" > <UML:Parameter visibility="public" xmi.id="88" value="" type="bool" name="loadAll" /> @@ -92,39 +92,39 @@ </UML:Operation> <UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" /> <UML:Operation visibility="public" xmi.id="98" type="void" name="loadIds" /> - <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" > - <UML:Parameter visibility="public" xmi.id="100" value="" type="QString" name="category" /> - <UML:Parameter visibility="public" xmi.id="101" value="" type="QString" name="filename" /> + <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="tqfind" > + <UML:Parameter visibility="public" xmi.id="100" value="" type=TQSTRING_OBJECT_NAME_STRING name="category" /> + <UML:Parameter visibility="public" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="102" type="void" name="addModified" > <UML:Parameter visibility="public" xmi.id="103" value="" type="PilotMemo *" name="memo" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="104" type="QPtrList<Memofile>" name="getModified" /> <UML:Attribute visibility="private" xmi.id="83" value="" type="QMap" name="_categories" /> - <UML:Attribute visibility="private" xmi.id="85" value="" type="QString" name="_baseDirectory" /> + <UML:Attribute visibility="private" xmi.id="85" value="" type=TQSTRING_OBJECT_NAME_STRING name="_baseDirectory" /> <UML:Attribute visibility="private" xmi.id="93" value="" type="QPtrList<Memofile>" name="_memofiles" /> </UML:Class> <UML:Class visibility="public" xmi.id="64" name="Memofile" > <UML:Operation visibility="public" xmi.id="65" type="" name="Memofile" > <UML:Parameter visibility="public" xmi.id="66" value="" type="PilotMemo*" name="memo" /> - <UML:Parameter visibility="public" xmi.id="67" value="" type="QString" name="categoryName" /> + <UML:Parameter visibility="public" xmi.id="67" value="" type=TQSTRING_OBJECT_NAME_STRING name="categoryName" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="68" type="" name="Memofile" > <UML:Parameter visibility="public" xmi.id="69" value="" type="recordid_t" name="id" /> <UML:Parameter visibility="public" xmi.id="70" value="" type="int" name="category" /> - <UML:Parameter visibility="public" xmi.id="71" value="" type="QString" name="categoryName" /> + <UML:Parameter visibility="public" xmi.id="71" value="" type=TQSTRING_OBJECT_NAME_STRING name="categoryName" /> <UML:Parameter visibility="public" xmi.id="72" value="" type="uint" name="lastModifiedTime" /> - <UML:Parameter visibility="public" xmi.id="73" value="" type="QString" name="filename" /> - <UML:Parameter visibility="public" xmi.id="74" value="" type="QString" name="text" /> + <UML:Parameter visibility="public" xmi.id="73" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> + <UML:Parameter visibility="public" xmi.id="74" value="" type=TQSTRING_OBJECT_NAME_STRING name="text" /> </UML:Operation> <UML:Operation visibility="public" xmi.id="75" type="uint" name="lastModified" /> - <UML:Operation visibility="public" xmi.id="76" type="QString" name="filename" /> + <UML:Operation visibility="public" xmi.id="76" type=TQSTRING_OBJECT_NAME_STRING name="filename" /> <UML:Attribute visibility="private" xmi.id="77" value="" type="uint" name="_lastModified" /> - <UML:Attribute visibility="private" xmi.id="78" value="" type="QString" name="_categoryName" /> - <UML:Attribute visibility="private" xmi.id="79" value="" type="QString" name="_filename" /> + <UML:Attribute visibility="private" xmi.id="78" value="" type=TQSTRING_OBJECT_NAME_STRING name="_categoryName" /> + <UML:Attribute visibility="private" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING name="_filename" /> </UML:Class> <UML:DataType stereotype="3" visibility="public" xmi.id="84" name="QMap" /> - <UML:DataType stereotype="3" visibility="public" xmi.id="86" name="QString" /> + <UML:DataType stereotype="3" visibility="public" xmi.id="86" name=TQSTRING_OBJECT_NAME_STRING /> <UML:DataType stereotype="3" visibility="public" xmi.id="94" name="QPtrList<Memofile>" /> <UML:Association visibility="public" xmi.id="36" > <UML:Association.connection> diff --git a/conduits/memofileconduit/memofiles.cc b/conduits/memofileconduit/memofiles.cc index c51915b..c8ce67b 100644 --- a/conduits/memofileconduit/memofiles.cc +++ b/conduits/memofileconduit/memofiles.cc @@ -89,7 +89,7 @@ void Memofiles::load (bool loadAll) // DEBUGKPILOT << fname // << ": checking category: [" << categoryName // << "], file: [" << file << "]." << endl; - Memofile * memofile = find(categoryName, file); + Memofile * memofile = tqfind(categoryName, file); if (NULL == memofile) { memofile = new Memofile(category, categoryName, file, _baseDirectory); memofile->setModified(true); @@ -316,7 +316,7 @@ bool Memofiles::loadFromMetadata () return true; } -Memofile * Memofiles::find (recordid_t id) +Memofile * Memofiles::tqfind (recordid_t id) { Memofile * memofile; @@ -331,7 +331,7 @@ Memofile * Memofiles::find (recordid_t id) } -Memofile * Memofiles::find (const TQString & category, const TQString & filename) +Memofile * Memofiles::tqfind (const TQString & category, const TQString & filename) { Memofile * memofile; @@ -353,7 +353,7 @@ void Memofiles::deleteMemo(PilotMemo * memo) if (! memo->isDeleted()) return; - Memofile * memofile = find(memo->id()); + Memofile * memofile = tqfind(memo->id()); if (memofile) { memofile->deleteFile(); _memofiles.remove(memofile); @@ -375,7 +375,7 @@ void Memofiles::addModifiedMemo (PilotMemo * memo) + TQString::number(memo->id()) + CSL1("], title: [") + memo->getTitle() + CSL1("]. "); - Memofile * memofile = find(memo->id()); + Memofile * memofile = tqfind(memo->id()); if (NULL == memofile) { _cudCounter.created(); @@ -653,7 +653,7 @@ TQString Memofiles::filename(PilotMemo * memo) if (filename.isEmpty()) { TQString text = memo->text(); - int i = text.find(CSL1("\n")); + int i = text.tqfind(CSL1("\n")); if (i > 1) { filename = text.left(i); } @@ -666,7 +666,7 @@ TQString Memofiles::filename(PilotMemo * memo) TQString category = _categories[memo->category()]; - Memofile * memofile = find(category, filename); + Memofile * memofile = tqfind(category, filename); // if we couldn't find a memofile with this filename, or if the // memofile that is found is the same as the memo that we're looking @@ -683,7 +683,7 @@ TQString Memofiles::filename(PilotMemo * memo) // for trouble. while (NULL != memofile && uniq <=20) { newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) ); - memofile = find(category, newfilename); + memofile = tqfind(category, newfilename); } return newfilename; diff --git a/conduits/memofileconduit/memofiles.h b/conduits/memofileconduit/memofiles.h index 72b6ed4..290cf3a 100644 --- a/conduits/memofileconduit/memofiles.h +++ b/conduits/memofileconduit/memofiles.h @@ -55,8 +55,8 @@ public: TQPtrList<Memofile> getModified(); TQPtrList<Memofile> getAll() { return _memofiles; } ; - Memofile * find (const TQString & category, const TQString & filename); - Memofile * find (recordid_t id); + Memofile * tqfind (const TQString & category, const TQString & filename); + Memofile * tqfind (recordid_t id); MemoCategoryMap readCategoryMetadata(); void setCategories(MemoCategoryMap map) { _categories = map; } ; diff --git a/conduits/memofileconduit/setup_base.ui b/conduits/memofileconduit/setup_base.ui index 5053469..606bf5e 100644 --- a/conduits/memofileconduit/setup_base.ui +++ b/conduits/memofileconduit/setup_base.ui @@ -3,7 +3,7 @@ <comment>A tabWidget for configuring the Memofile-conduit settings.</comment> <author>Jason 'vanRijn' Kasper</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -46,7 +46,7 @@ the Memofile-conduit settings.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -60,7 +60,7 @@ the Memofile-conduit settings.</comment> </property> <property name="tqlayoutMargin" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget2</cstring> </property> @@ -88,7 +88,7 @@ the Memofile-conduit settings.</comment> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -96,7 +96,7 @@ the Memofile-conduit settings.</comment> <string>Sync private records:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -115,7 +115,7 @@ the Memofile-conduit settings.</comment> <string>Select the directory you want to store your PDA's memos in</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>fSyncPrivate</cstring> </property> diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am index 7a052da..ce08524 100644 --- a/conduits/notepadconduit/Makefile.am +++ b/conduits/notepadconduit/Makefile.am @@ -9,6 +9,6 @@ kde_module_LTLIBRARIES = conduit_notepad.la conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ notepad-conduit.cc notepad-factory.cc -conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) +conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) diff --git a/conduits/notepadconduit/notepad-conduit.cc b/conduits/notepadconduit/notepad-conduit.cc index 10d9bf7..c33bd41 100644 --- a/conduits/notepadconduit/notepad-conduit.cc +++ b/conduits/notepadconduit/notepad-conduit.cc @@ -76,7 +76,7 @@ NotepadConduit::~NotepadConduit() TQDir dir(NotepadConduitSettings::outputDirectory()); if(!dir.exists() && !dir.mkdir(dir.path())) { - emit logError(i18n("Unable to open %1").arg(dir.path())); + emit logError(i18n("Unable to open %1").tqarg(dir.path())); delayDone(); return false; } @@ -115,8 +115,8 @@ bool NotepadConduit::event(TQEvent *e) // NotepadActionThread //----------------------------------------------------------------------------- -NotepadActionThread::NotepadActionThread(TQObject *parent, KPilotLink *link) : - fParent(parent), fLink(link), notSaved(0), saved(0) +NotepadActionThread::NotepadActionThread(TQObject *tqparent, KPilotLink *link) : + fParent(tqparent), fLink(link), notSaved(0), saved(0) { FUNCTIONSETUP; } @@ -251,7 +251,7 @@ void NotepadActionThread::saveImage(struct NotePad *n) n->changeDate.min, n->changeDate.sec); } - TQString imgname = TQString("%1/%2.png").arg(NotepadConduitSettings::outputDirectory()).arg(filename); + TQString imgname = TQString("%1/%2.png").tqarg(NotepadConduitSettings::outputDirectory()).tqarg(filename); #ifdef DEBUG diff --git a/conduits/notepadconduit/notepad-conduit.h b/conduits/notepadconduit/notepad-conduit.h index 907a306..6f76768 100644 --- a/conduits/notepadconduit/notepad-conduit.h +++ b/conduits/notepadconduit/notepad-conduit.h @@ -59,10 +59,10 @@ private: /** * This class saves the notepads to disk */ -class NotepadActionThread : public QThread +class NotepadActionThread : public TQThread { public: - NotepadActionThread(TQObject *parent, KPilotLink *link); + NotepadActionThread(TQObject *tqparent, KPilotLink *link); virtual void run(); int getFailed() { return notSaved; } diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc index 0e1094b..fdb0841 100644 --- a/conduits/notepadconduit/notepad-factory.cc +++ b/conduits/notepadconduit/notepad-factory.cc @@ -47,7 +47,7 @@ class NotepadConduitConfig : public ConduitConfigBase { public: - NotepadConduitConfig(TQWidget *parent=0L, const char *n=0L); + NotepadConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); static ConduitConfigBase *create(TQWidget *p, const char *n) diff --git a/conduits/notepadconduit/notepad-setup.ui b/conduits/notepadconduit/notepad-setup.ui index c625d97..d7fd026 100644 --- a/conduits/notepadconduit/notepad-setup.ui +++ b/conduits/notepadconduit/notepad-setup.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>NotepadWidget</class> <author>Jörn Ahrens</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -20,11 +20,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -57,7 +57,7 @@ <cstring>fOutputDirectory</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am index 783e881..bdcc43f 100644 --- a/conduits/null/Makefile.am +++ b/conduits/null/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_null.la conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc -conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = nullconduit.kcfg diff --git a/conduits/null/null-conduit.cc b/conduits/null/null-conduit.cc index d0c07c5..29d2499 100644 --- a/conduits/null/null-conduit.cc +++ b/conduits/null/null-conduit.cc @@ -35,7 +35,7 @@ // Only include what we really need: // First UNIX system stuff, then std C++, -// then Qt, then KDE, then local includes. +// then TQt, then KDE, then local includes. // // #include <time.h> diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc index c2d381d..6b80615 100644 --- a/conduits/null/null-factory.cc +++ b/conduits/null/null-factory.cc @@ -47,7 +47,7 @@ class NullConduitConfig : public ConduitConfigBase { public: - NullConduitConfig(TQWidget *parent=0L, const char *n=0L); + NullConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/null/setup_base.ui b/conduits/null/setup_base.ui index 2bcb518..ed7d234 100644 --- a/conduits/null/setup_base.ui +++ b/conduits/null/setup_base.ui @@ -3,7 +3,7 @@ <comment>A tabWidget for configuring the Null-conduit settings.</comment> <author>Adriaan de Groot</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -46,7 +46,7 @@ the Null-conduit settings.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -60,7 +60,7 @@ the Null-conduit settings.</comment> </property> <property name="tqlayoutMargin" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget2</cstring> </property> @@ -77,7 +77,7 @@ the Null-conduit settings.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>fLogMessage</cstring> </property> @@ -88,7 +88,7 @@ the Null-conduit settings.</comment> <string><qt>Enter the message to add to the Sync Log on your Pilot here.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am index 5b6becd..365cd1b 100644 --- a/conduits/popmail/Makefile.am +++ b/conduits/popmail/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ popmail-factory.cc setupDialog.cc \ popmail-conduit.cc -conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lDCOP conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO) # this option you can leave out. Just, if you use "make dist", you need it diff --git a/conduits/popmail/setup-dialog.ui b/conduits/popmail/setup-dialog.ui index d9cf74e..e82f4ad 100644 --- a/conduits/popmail/setup-dialog.ui +++ b/conduits/popmail/setup-dialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PopMailWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PopMailWidget</cstring> </property> @@ -22,11 +22,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>fTabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -54,7 +54,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -65,7 +65,7 @@ <string><qt>Select the method KPilot will use to send the mail from your Handheld to the recipients here. Depending on the method you choose, the other fields in the dialog may be enabled or disabled. Currently, the only <i>working</i> method is through KMail.</qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -87,7 +87,7 @@ <string><qt>Enter the email address you want to send messages as here.</qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -95,7 +95,7 @@ <string>Signature file:</string> </property> <property name="whatsThis" stdset="0"> - <string><qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file tqcontains the text that is added to the end of your outgoing mail messages.</qt></string> + <string><qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.</qt></string> </property> </widget> <widget class="KURLRequester" row="2" column="1"> @@ -103,10 +103,10 @@ <cstring>fSignature</cstring> </property> <property name="whatsThis" stdset="0"> - <string><qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file tqcontains the text that is added to the end of your outgoing mail messages.</qt></string> + <string><qt>If you want to add a signature file, enter the location of your signature file (usually, <i>.signature</i>, located in your home folder) here, or select it clicking the file picker button. The signature file contains the text that is added to the end of your outgoing mail messages.</qt></string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Do Not Send Mail</string> diff --git a/conduits/popmail/setupDialog.h b/conduits/popmail/setupDialog.h index 76bf9af..cc9d831 100644 --- a/conduits/popmail/setupDialog.h +++ b/conduits/popmail/setupDialog.h @@ -40,6 +40,7 @@ class PopMailWidget; // From setup-dialog.ui class PopMailWidgetConfig : public ConduitConfigBase { Q_OBJECT + TQ_OBJECT public: PopMailWidgetConfig(TQWidget *, const char *); virtual void load(); diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am index 9fd691e..e00693a 100644 --- a/conduits/recordconduit/Makefile.am +++ b/conduits/recordconduit/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc -conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = settings.kcfg diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc index 8337733..76b790e 100644 --- a/conduits/recordconduit/factory.cc +++ b/conduits/recordconduit/factory.cc @@ -48,7 +48,7 @@ class ConduitConfig : public ConduitConfigBase { public: - ConduitConfig(TQWidget *parent=0L, const char *n=0L); + ConduitConfig(TQWidget *tqparent=0L, const char *n=0L); virtual void commit(); virtual void load(); protected: diff --git a/conduits/recordconduit/setup_base.ui b/conduits/recordconduit/setup_base.ui index 8bd9790..389219b 100644 --- a/conduits/recordconduit/setup_base.ui +++ b/conduits/recordconduit/setup_base.ui @@ -3,7 +3,7 @@ <comment>A tabWidget for configuring the Record-conduit settings.</comment> <author>Adriaan de Groot</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -46,7 +46,7 @@ the Record-conduit settings.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -60,7 +60,7 @@ the Record-conduit settings.</comment> </property> <property name="tqlayoutMargin" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget2</cstring> </property> @@ -77,7 +77,7 @@ the Record-conduit settings.</comment> <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>fLogMessage</cstring> </property> @@ -88,7 +88,7 @@ the Record-conduit settings.</comment> <string><qt>Enter the message to add to the Sync Log on your Pilot here.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -99,7 +99,7 @@ the Record-conduit settings.</comment> <cstring>fLogMessage</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -110,7 +110,7 @@ the Record-conduit settings.</comment> <cstring>fDatabases</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>fDatabases</cstring> </property> @@ -135,7 +135,7 @@ the Record-conduit settings.</comment> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>fFailImmediately</cstring> </property> diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am index b89b4df..3a5b59a 100644 --- a/conduits/sysinfoconduit/Makefile.am +++ b/conduits/sysinfoconduit/Makefile.am @@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \ sysinfo-setup.cc \ sysinfo-conduit.cc \ sysinfo-setup_dialog.ui -conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO) kpilot_sysinfo_data_DATA = Template.html Template.txt diff --git a/conduits/sysinfoconduit/Template.html b/conduits/sysinfoconduit/Template.html index e5a33e0..56aa328 100644 --- a/conduits/sysinfoconduit/Template.html +++ b/conduits/sysinfoconduit/Template.html @@ -147,7 +147,7 @@ <tbody> <tr><td><b>Operating System:</b></td><td>#os#</td></tr> <tr><td><b>Hostname:</b></td><td>#hostname#</td></tr> - <tr><td><b>Qt Version:</b></td><td>#qt#</td></tr> + <tr><td><b>TQt Version:</b></td><td>#qt#</td></tr> <tr><td><b>KDE Libraries Version:</b></td><td>#kde#</td></tr> <tr><td><b>KPilot Version:</b></td><td>#kpilot#</td></tr> <tr><td><b>Pilot-Link Version:</b></td><td>#pilotlink#</td></tr> diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 64c53bc..b46f5a3 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -107,7 +107,7 @@ const TQString SysInfoConduit::defaultpage = CSL1("KPilot System Information Pag "-) Version Information (Desktop)\n" " Operating System: #os#\n" " Hostname: #hostname#\n" -" Qt Version: #qt#\n" +" TQt Version: #qt#\n" " KDE Version: #kde#\n" " KPilot Version: #kpilot#\n" " Pilot-Link Version: #pilotlink#\n" @@ -299,10 +299,10 @@ void SysInfoConduit::storageInfo() const KPilotCard *device = fHandle->getCardInfo(1); if (device) { fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)") - .arg(TQString::tqfromLatin1(device->getCardName())) - .arg(TQString::tqfromLatin1(device->getCardManufacturer())) - .arg(device->getRamFree()/1024) - .arg(device->getRamSize()/1024); + .tqarg(TQString::tqfromLatin1(device->getCardName())) + .tqarg(TQString::tqfromLatin1(device->getCardManufacturer())) + .tqarg(device->getRamFree()/1024) + .tqarg(device->getRamSize()/1024); KPILOT_DELETE(device); } else { fValues[CSL1("cards")] = i18n("No Cards available via pilot-link"); @@ -408,25 +408,25 @@ void SysInfoConduit::pcVersionInfo() struct utsname name; if (uname (&name) >= 0) { fValues[CSL1("os")] = CSL1("%1 %3, %5") - .arg(TQString::tqfromLatin1(name.sysname)) - .arg(TQString::tqfromLatin1(name.release)) - .arg(TQString::tqfromLatin1(name.machine)); - fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::tqfromLatin1(name.nodename)); + .tqarg(TQString::tqfromLatin1(name.sysname)) + .tqarg(TQString::tqfromLatin1(name.release)) + .tqarg(TQString::tqfromLatin1(name.machine)); + fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(name.nodename)); } #ifdef KDE_VERSION_STRING fValues[CSL1("kde")] = TQString::tqfromLatin1(KDE_VERSION_STRING); #endif -#ifdef QT_VERSION_STR - fValues[CSL1("qt")] = TQString::tqfromLatin1(QT_VERSION_STR); +#ifdef TQT_VERSION_STR + fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR); #endif fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4") - .arg(PILOT_LINK_VERSION) - .arg(PILOT_LINK_MAJOR) - .arg(PILOT_LINK_MINOR) + .tqarg(PILOT_LINK_VERSION) + .tqarg(PILOT_LINK_MAJOR) + .tqarg(PILOT_LINK_MINOR) #ifdef PILOT_LINK_PATCH - .arg(TQString::tqfromLatin1(PILOT_LINK_PATCH)); + .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH)); #else - .arg(TQString()); + .tqarg(TQString()); #endif keepParts.append(CSL1("pcversion")); } else removeParts.append(CSL1("pcversion")); @@ -441,12 +441,12 @@ void SysInfoConduit::palmVersionInfo() * - #palmos# */ /* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)") - .arg(fHandle->getSysInfo()->getMajorVersion()) - .arg(fHandle->getSysInfo()->getMinorVersion()) - .arg(fHandle->getSysInfo()->getCompatMajorVersion()) - .arg(fHandle->getSysInfo()->getCompatMinorVersion());*/ + .tqarg(fHandle->getSysInfo()->getMajorVersion()) + .tqarg(fHandle->getSysInfo()->getMinorVersion()) + .tqarg(fHandle->getSysInfo()->getCompatMajorVersion()) + .tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/ KPilotSysInfo i = deviceLink()->getSysInfo(); - fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").arg(i.getMajorVersion()).arg(i.getMinorVersion()); + fValues[CSL1("palmos")] = CSL1("PalmOS %1.%2").tqarg(i.getMajorVersion()).tqarg(i.getMinorVersion()); keepParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion")); @@ -513,12 +513,12 @@ void SysInfoConduit::writeFile() // Remove all parts not extracted for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) { - TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").arg(*it).arg(*it)); + TQRegExp re(CSL1("<!--#if%1#.*#endif%1#-->").tqarg(*it).tqarg(*it)); re.setMinimal(true); output.remove(re); } for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { - TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").arg(*it).arg(*it)); + TQRegExp re(CSL1("<!--#if%1#(.*)#endif%1#-->").tqarg(*it).tqarg(*it)); re.setMinimal(true); output.tqreplace(re, CSL1("\\1")); } @@ -526,7 +526,7 @@ void SysInfoConduit::writeFile() // Do a loop through all keys in fValues TQMap<TQString,TQString>::Iterator it; for ( it = fValues.begin(); it != fValues.end(); ++it ) { - output.tqreplace(CSL1("#%1#").arg(it.key()), it.data()); + output.tqreplace(CSL1("#%1#").tqarg(it.key()), it.data()); } // Insert the list of databases @@ -571,7 +571,7 @@ void SysInfoConduit::writeFile() dbstring.append(newpatt); } - // Now, just tqreplace the whole found pattern by the string we just constructed. + // Now, just replace the whole found pattern by the string we just constructed. output.tqreplace(re.cap(0), dbstring); } @@ -584,11 +584,11 @@ void SysInfoConduit::writeFile() TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() ); fOutputFile=fi.absFilePath(); WARNINGKPILOT << "Unable to open output file, using " << fOutputFile << " instead." << endl; - emit logMessage(i18n("Unable to open output file, using %1 instead.").arg(fOutputFile)); + emit logMessage(i18n("Unable to open output file, using %1 instead.").tqarg(fOutputFile)); outfile.setName(fOutputFile); if (!outfile.open(IO_WriteOnly)) { WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; - emit logError(i18n("Unable to open %1").arg(fOutputFile)); + emit logError(i18n("Unable to open %1").tqarg(fOutputFile)); TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); return; } @@ -599,7 +599,7 @@ void SysInfoConduit::writeFile() outstream<<output; outfile.close(); - emit logMessage(i18n("Handheld system information written to the file %1").arg(fOutputFile)); + emit logMessage(i18n("Handheld system information written to the file %1").tqarg(fOutputFile)); TQTimer::singleShot(0, this, TQT_SLOT(cleanup())); } diff --git a/conduits/sysinfoconduit/sysinfo-conduit.h b/conduits/sysinfoconduit/sysinfo-conduit.h index 803bc73..6fde73c 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.h +++ b/conduits/sysinfoconduit/sysinfo-conduit.h @@ -33,6 +33,7 @@ class SysInfoConduit : public ConduitAction { Q_OBJECT + TQ_OBJECT public: SysInfoConduit( KPilotLink *o, diff --git a/conduits/sysinfoconduit/sysinfo-setup.cc b/conduits/sysinfoconduit/sysinfo-setup.cc index 271db65..7818e09 100644 --- a/conduits/sysinfoconduit/sysinfo-setup.cc +++ b/conduits/sysinfoconduit/sysinfo-setup.cc @@ -64,7 +64,7 @@ const sysinfoEntry_t sysinfoEntries[] = /* -** The QCheckListItems used in the list of parts to print have +** The TQCheckListItems used in the list of parts to print have ** several text fields with special meanings. ** 0: The text displayed in the list. ** 1: The index of the item in the sysinfoEntries array. @@ -82,7 +82,7 @@ const sysinfoEntry_t sysinfoEntries[] = ** This is a convenience define to update an item's "original setting". */ #define updateSetting(i) { TQCheckListItem *ubbu=(i); \ - ubbu->setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : TQString::null)); } + ubbu->setText(PART_SETTING,(ubbu->isOn() ? CSL1("1") : TQString())); } SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) : diff --git a/conduits/sysinfoconduit/sysinfo-setup.h b/conduits/sysinfoconduit/sysinfo-setup.h index 400dea3..ae15b51 100644 --- a/conduits/sysinfoconduit/sysinfo-setup.h +++ b/conduits/sysinfoconduit/sysinfo-setup.h @@ -36,7 +36,7 @@ class SysInfoWidget; class SysInfoWidgetConfig : public ConduitConfigBase { public: - SysInfoWidgetConfig(TQWidget *parent, const char *); + SysInfoWidgetConfig(TQWidget *tqparent, const char *); virtual void commit(); virtual void load(); virtual bool isModified() const; diff --git a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui index 935db05..6b8e2b9 100644 --- a/conduits/sysinfoconduit/sysinfo-setup_dialog.ui +++ b/conduits/sysinfoconduit/sysinfo-setup_dialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SysInfoWidget</class> <author>Reinhold Kainhofer</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -23,11 +23,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -63,7 +63,7 @@ <string><qt>Enter here, or select by clicking the file picker button, the location and file name of the output file used to store the handheld's system information.</qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -77,7 +77,7 @@ <string><qt>Enter here, or select by clicking the file picker button, the location and file name of the output file used to store the handheld's system information.</qt></string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fOutputType</cstring> </property> @@ -88,7 +88,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioButton3</cstring> </property> @@ -102,7 +102,7 @@ <string><qt>Select this option to output the system information data as a HTML document.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioButton4</cstring> </property> @@ -124,7 +124,7 @@ <string><qt>Enter here, or select by clicking on the file picker button, the location of the template to be used if you select the Custom template option.</qt></string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioButton5</cstring> </property> @@ -139,7 +139,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -167,7 +167,7 @@ </size> </property> </spacer> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Output Type</string> diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am index 8c9ae93..d6018b1 100644 --- a/conduits/timeconduit/Makefile.am +++ b/conduits/timeconduit/Makefile.am @@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \ time-setup.cc \ time-conduit.cc \ time-setup_dialog.ui -conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) kde_kcfg_DATA = timeconduit.kcfg diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h index b0bb2f0..e662532 100644 --- a/conduits/timeconduit/time-setup.h +++ b/conduits/timeconduit/time-setup.h @@ -37,8 +37,9 @@ class KAboutData; class TimeWidgetConfig : public ConduitConfigBase { Q_OBJECT + TQ_OBJECT public: - TimeWidgetConfig(TQWidget *parent, const char *); + TimeWidgetConfig(TQWidget *tqparent, const char *); virtual void commit(); virtual void load(); static ConduitConfigBase *create(TQWidget *,const char *); diff --git a/conduits/timeconduit/time-setup_dialog.ui b/conduits/timeconduit/time-setup_dialog.ui index a32fbe4..2b3dbba 100644 --- a/conduits/timeconduit/time-setup_dialog.ui +++ b/conduits/timeconduit/time-setup_dialog.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>TimeWidget</class> <author>Reinhold Kainhofer</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form2</cstring> </property> @@ -23,11 +23,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -55,7 +55,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>directionGroup</cstring> </property> @@ -72,7 +72,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -86,7 +86,7 @@ <string><qt>Select this option to synchronize the handheld time with the PC time, by using the PC time on both.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -102,7 +102,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am index 4f0dcd8..76aae3d 100644 --- a/conduits/vcalconduit/Makefile.am +++ b/conduits/vcalconduit/Makefile.am @@ -24,17 +24,15 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ vcal-factory.cc vcal-setup.cc -conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \ - ../../../libkcal/libkcal.la \ libvcalconduit_shared.la conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ todo-factory.cc todo-setup.cc -conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_QT) -lkdecore -lkio -lkdeui -lkcal -lkresources conduit_todo_la_LIBADD = ../../lib/libkpilot.la \ - ../../../libkcal/libkcal.la \ libvcalconduit_shared.la conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc index 209a0e9..76d756d 100644 --- a/conduits/vcalconduit/cleanupstate.cc +++ b/conduits/vcalconduit/cleanupstate.cc @@ -91,7 +91,7 @@ void CleanUpState::startSync( ConduitAction *ca ) vccb->addLogError( i18n( "An error occurred while uploading" " \"%1\". You can try to upload " "the temporary local file \"%2\" manually.") - .arg(vccb->config()->calendarFile()).arg(fCalendarFile)); + .tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile)); } else { KIO::NetAccess::removeTempFile( fCalendarFile ); diff --git a/conduits/vcalconduit/hhtopcstate.cc b/conduits/vcalconduit/hhtopcstate.cc index 82024f1..4fa12af 100644 --- a/conduits/vcalconduit/hhtopcstate.cc +++ b/conduits/vcalconduit/hhtopcstate.cc @@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca ) { KCal::Incidence *e = vccb->addRecord( r ); if ( vccb->config()->syncArchived() && archiveRecord ) { - e->setSyncStatus( KCal::Incidence::SYNCDEL ); + e->setSynctqStatus( KCal::Incidence::SYNCDEL ); } } } @@ -218,7 +218,7 @@ void VCalConduitBase::slotPalmRecToPC() { KCal::Incidence*e=addRecord(r); if (config()->syncArchived() && archiveRecord) { - e->setSyncStatus(KCal::Incidence::SYNCDEL); + e->setSynctqStatus(KCal::Incidence::SYNCDEL); } } } diff --git a/conduits/vcalconduit/korganizerConduit.ui b/conduits/vcalconduit/korganizerConduit.ui index 7ff813a..b6cefab 100644 --- a/conduits/vcalconduit/korganizerConduit.ui +++ b/conduits/vcalconduit/korganizerConduit.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>VCalWidget</class> <author>Adriaan de Groot</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -44,7 +44,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -58,7 +58,7 @@ </property> <property name="tqlayoutMargin" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget2</cstring> </property> @@ -86,7 +86,7 @@ </size> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>fSyncDestination</cstring> </property> @@ -97,7 +97,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fSyncStdCalendar</cstring> </property> @@ -108,7 +108,7 @@ <string><qt>Select this option to synchronize with the calendar specified by the KDE calendar settings.</qt></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>fSyncFile</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>fArchive</cstring> </property> @@ -157,7 +157,7 @@ be saved in the calendar on the PC.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -168,7 +168,7 @@ be saved in the calendar on the PC.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fTextLabel</cstring> </property> @@ -187,7 +187,7 @@ be saved in the calendar on the PC.</string> <cstring>fConflictResolution</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Use KPilot's Global Setting</string> diff --git a/conduits/vcalconduit/pctohhstate.cc b/conduits/vcalconduit/pctohhstate.cc index d2866fd..84d50ed 100644 --- a/conduits/vcalconduit/pctohhstate.cc +++ b/conduits/vcalconduit/pctohhstate.cc @@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca ) if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) ) { - if( e->syncStatus() == KCal::Incidence::SYNCDEL ) + if( e->synctqStatus() == KCal::Incidence::SYNCDEL ) { vccb->deletePalmRecord( e, s ); } diff --git a/conduits/vcalconduit/teststate.cc b/conduits/vcalconduit/teststate.cc index c762d32..7088033 100644 --- a/conduits/vcalconduit/teststate.cc +++ b/conduits/vcalconduit/teststate.cc @@ -38,7 +38,7 @@ #include "teststate.h" #include "vcal-conduitbase.h" -TestState::TestState() : fCalendar( TQString::null ) +TestState::TestState() : fCalendar( TQString() ) { fState = eTest; } diff --git a/conduits/vcalconduit/todo-conduit.cc b/conduits/vcalconduit/todo-conduit.cc index 9b1007c..fee93d6 100644 --- a/conduits/vcalconduit/todo-conduit.cc +++ b/conduits/vcalconduit/todo-conduit.cc @@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence() } if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator; while (fAllTodosIterator != fAllTodos.end() && - e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId()) + e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId()) { e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L; #ifdef DEBUG if(e) - DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl; + DEBUGKPILOT<< e->summary()<<" had SynctqStatus="<<e->synctqStatus()<<endl; #endif } @@ -230,7 +230,7 @@ const TQString TodoConduit::getTitle(PilotRecordBase *de) { return TQString(d->getDescription()); } - return TQString::null; + return TQString(); } diff --git a/conduits/vcalconduit/todo-conduit.h b/conduits/vcalconduit/todo-conduit.h index 8d8780e..5938d41 100644 --- a/conduits/vcalconduit/todo-conduit.h +++ b/conduits/vcalconduit/todo-conduit.h @@ -64,6 +64,7 @@ public: class TodoConduit : public VCalConduitBase { Q_OBJECT + TQ_OBJECT public: TodoConduit(KPilotLink *, const char *name=0L, diff --git a/conduits/vcalconduit/todoRecord.cc b/conduits/vcalconduit/todoRecord.cc index 9bc0998..f3baaeb 100644 --- a/conduits/vcalconduit/todoRecord.cc +++ b/conduits/vcalconduit/todoRecord.cc @@ -134,8 +134,8 @@ bool KCalSync::setTodo(KCal::Todo *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); return true; } diff --git a/conduits/vcalconduit/vcal-conduit.cc b/conduits/vcalconduit/vcal-conduit.cc index d882cf8..52bd759 100644 --- a/conduits/vcalconduit/vcal-conduit.cc +++ b/conduits/vcalconduit/vcal-conduit.cc @@ -155,7 +155,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence() if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator; // Then walk the list until we find an unsynced entry while ( fAllEventsIterator != fAllEvents.end() && - e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0) + e && e->synctqStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0) { e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L; } @@ -200,7 +200,7 @@ const TQString VCalConduit::getTitle(PilotRecordBase *de) { PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de); if (d) return TQString(d->getDescription()); - return TQString::null; + return TQString(); } @@ -219,7 +219,7 @@ PilotRecord *VCalConduit::recordFromIncidence(PilotRecordBase *de, const KCal::I (e->recurrenceType() == KCal::Recurrence::rYearlyPos) ) { // Warn ahead of time - emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").arg(e->summary())); + emit logMessage(i18n("Event \"%1\" has a yearly recurrence other than by month, will change this to recurrence by month on handheld.").tqarg(e->summary())); } PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de); diff --git a/conduits/vcalconduit/vcal-conduit.h b/conduits/vcalconduit/vcal-conduit.h index ed47d71..482e8e7 100644 --- a/conduits/vcalconduit/vcal-conduit.h +++ b/conduits/vcalconduit/vcal-conduit.h @@ -67,6 +67,7 @@ public: class VCalConduit : public VCalConduitBase { Q_OBJECT + TQ_OBJECT public: VCalConduit(KPilotLink *, const char *name=0L, diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc index cd288ba..33ae4f1 100644 --- a/conduits/vcalconduit/vcal-conduitbase.cc +++ b/conduits/vcalconduit/vcal-conduitbase.cc @@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p ) << fCalendar->isLocalTime() << endl; emit logMessage( fCalendar->isLocalTime() ? - i18n( "Using local time zone: %1" ).arg( tz ) : - i18n( "Using non-local time zone: %1" ).arg( tz ) ); + i18n( "Using local time zone: %1" ).tqarg( tz ) : + i18n( "Using non-local time zone: %1" ).tqarg( tz ) ); KURL kurl( config()->calendarFile() ); if( !KIO::NetAccess::download( config()->calendarFile(), @@ -298,7 +298,7 @@ static void listResources( KCal::CalendarResources *p ) emit logError(i18n( "You chose to sync with the file \"%1\", which " "cannot be opened. Please make sure to supply a " "valid file name in the conduit's configuration dialog. " - "Aborting the conduit." ).arg( config()->calendarFile() ) ); + "Aborting the conduit." ).tqarg( config()->calendarFile() ) ); KIO::NetAccess::removeTempFile( fCalendarFile ); return false; } @@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p ) emit logError( i18n( "You chose to sync with the file \"%1\", which " "cannot be opened or created. Please make sure to supply a " "valid file name in the conduit's configuration dialog. " - "Aborting the conduit." ).arg( config()->calendarFile() ) ); + "Aborting the conduit." ).tqarg( config()->calendarFile() ) ); return false; } fl.close(); setFirstSync( true ); } addSyncLogEntry( i18n( "Syncing with file \"%1\"" ) - .arg( config()->calendarFile() ) ); + .tqarg( config()->calendarFile() ) ); break; } @@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p ) #endif addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) ); emit logMessage( fCalendar->isLocalTime() ? - i18n( "Using local time zone: %1" ).arg( tz ) : - i18n( "Using non-local time zone: %1" ).arg( tz ) ); + i18n( "Using local time zone: %1" ).tqarg( tz ) : + i18n( "Using non-local time zone: %1" ).tqarg( tz ) ); break; default: break; @@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de ) return KMessageBox::No == questionYesNo( query, i18n( "Conflicting Entries" ), - TQString::null, + TQString(), 0 /* Never timeout */, i18n( "Handheld" ), i18n( "PC" )); } @@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *) if ( e && de ) { // TODO: check for conflict, and if there is one, ask for resolution - if ( ( e->syncStatus() != KCal::Incidence::SYNCNONE ) + if ( ( e->synctqStatus() != KCal::Incidence::SYNCNONE ) && r->isModified() ) { // TODO: I have not yet found a way to complete ignore an item @@ -468,8 +468,8 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *) // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); fLocalDatabase->writeRecord( r ); } else @@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, return; } - if ( e->syncStatus() == KCal::Incidence::SYNCDEL ) + if ( e->synctqStatus() == KCal::Incidence::SYNCDEL ) { DEBUGKPILOT << fname << ": don't write deleted incidence " << e->summary() << " to the palm" << endl; @@ -573,15 +573,15 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); KPILOT_DELETE( r ); } } const TQString VCalConduitBase::dbname() { - return TQString::null; + return TQString(); } PilotRecord *VCalConduitBase::readRecordByIndex( int index ) diff --git a/conduits/vcalconduit/vcal-conduitbase.h b/conduits/vcalconduit/vcal-conduitbase.h index 4e2f3ae..7f04cfd 100644 --- a/conduits/vcalconduit/vcal-conduitbase.h +++ b/conduits/vcalconduit/vcal-conduitbase.h @@ -75,6 +75,7 @@ public: class VCalConduitBase : public ConduitAction { Q_OBJECT + TQ_OBJECT public: VCalConduitBase(KPilotLink *, const char *name = 0L, diff --git a/conduits/vcalconduit/vcalRecord.cc b/conduits/vcalconduit/vcalRecord.cc index 898bc79..fc274b1 100644 --- a/conduits/vcalconduit/vcalRecord.cc +++ b/conduits/vcalconduit/vcalRecord.cc @@ -512,8 +512,8 @@ bool KCalSync::setEvent(KCal::Event *e, // NOTE: This MUST be done last, since every other set* call // calls updated(), which will trigger an - // setSyncStatus(SYNCMOD)!!! - e->setSyncStatus(KCal::Incidence::SYNCNONE); + // setSynctqStatus(SYNCMOD)!!! + e->setSynctqStatus(KCal::Incidence::SYNCNONE); return true; } |