TQt4 port kpilot

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent e340db6499
commit f6f9c296c3

@ -2,7 +2,7 @@
<class>KPilotCustomFields</class> <class>KPilotCustomFields</class>
<comment>This form lets you edit the custom fields synced from PalmOS handhelds by the addressbook conduit of KPilot.</comment> <comment>This form lets you edit the custom fields synced from PalmOS handhelds by the addressbook conduit of KPilot.</comment>
<author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author> <author>Reinhold Kainhofer &lt;reinhold@kainhofer.com&gt;</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>KPILOT</cstring> <cstring>KPILOT</cstring>
</property> </property>
@ -24,7 +24,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>mCustomFieldsGroups</cstring> <cstring>mCustomFieldsGroups</cstring>
</property> </property>
@ -38,7 +38,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>mCustom3Label</cstring> <cstring>mCustom3Label</cstring>
</property> </property>
@ -52,7 +52,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
<property name="name"> <property name="name">
<cstring>mCustom4Label</cstring> <cstring>mCustom4Label</cstring>
</property> </property>
@ -66,7 +66,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="3" column="1"> <widget class="TQLineEdit" row="3" column="1">
<property name="name"> <property name="name">
<cstring>X_CUSTOM2</cstring> <cstring>X_CUSTOM2</cstring>
</property> </property>
@ -74,7 +74,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="2" column="1"> <widget class="TQLineEdit" row="2" column="1">
<property name="name"> <property name="name">
<cstring>X_CUSTOM1</cstring> <cstring>X_CUSTOM1</cstring>
</property> </property>
@ -82,7 +82,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="4" column="1"> <widget class="TQLineEdit" row="4" column="1">
<property name="name"> <property name="name">
<cstring>X_CUSTOM3</cstring> <cstring>X_CUSTOM3</cstring>
</property> </property>
@ -90,7 +90,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>mCustom2Label</cstring> <cstring>mCustom2Label</cstring>
</property> </property>
@ -104,7 +104,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>mCustom1Label</cstring> <cstring>mCustom1Label</cstring>
</property> </property>
@ -118,7 +118,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="1" column="1"> <widget class="TQLineEdit" row="1" column="1">
<property name="name"> <property name="name">
<cstring>X_CUSTOM0</cstring> <cstring>X_CUSTOM0</cstring>
</property> </property>
@ -134,7 +134,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>mCustomFieldsExplanation</cstring> <cstring>mCustomFieldsExplanation</cstring>
</property> </property>
@ -147,7 +147,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>mMetaSyncGroup</cstring> <cstring>mMetaSyncGroup</cstring>
</property> </property>
@ -161,7 +161,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>mRecordIDLabel</cstring> <cstring>mRecordIDLabel</cstring>
</property> </property>
@ -172,7 +172,7 @@
<cstring>X_RecordID</cstring> <cstring>X_RecordID</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="3"> <widget class="TQLabel" row="1" column="3">
<property name="name"> <property name="name">
<cstring>mSyncFlagLabel</cstring> <cstring>mSyncFlagLabel</cstring>
</property> </property>
@ -217,7 +217,7 @@
</size> </size>
</property> </property>
</spacer> </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"> <property name="name">
<cstring>mMetaSyncSettingsWarning</cstring> <cstring>mMetaSyncSettingsWarning</cstring>
</property> </property>
@ -229,7 +229,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="QSpinBox" row="1" column="1"> <widget class="TQSpinBox" row="1" column="1">
<property name="name"> <property name="name">
<cstring>X_RecordID</cstring> <cstring>X_RecordID</cstring>
</property> </property>
@ -240,7 +240,7 @@ Do NOT change these values: doing so will almost certainly result in data loss w
<number>2147483647</number> <number>2147483647</number>
</property> </property>
</widget> </widget>
<widget class="QSpinBox" row="1" column="4"> <widget class="TQSpinBox" row="1" column="4">
<property name="name"> <property name="name">
<cstring>X_Flag</cstring> <cstring>X_Flag</cstring>
</property> </property>

@ -11,7 +11,7 @@ conduit_address_la_SOURCES = \
abbrowser-setup.cc \ abbrowser-setup.cc \
kabcRecord.cc \ kabcRecord.cc \
abbrowser-conduit.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 conduit_address_la_LIBADD = ../../lib/libkpilot.la -lkabc -lkabc_file
servicedir = $(kde_servicesdir) servicedir = $(kde_servicesdir)

@ -291,7 +291,7 @@ bool AbbrowserConduit::_loadAddressBook()
emit logError(i18n("You chose to sync with the file \"%1\", which " emit logError(i18n("You chose to sync with the file \"%1\", which "
"cannot be opened. Please make sure to supply a " "cannot be opened. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. " "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); KIO::NetAccess::removeTempFile(fABookFile);
stopTickle(); stopTickle();
return false; return false;
@ -395,7 +395,7 @@ bool AbbrowserConduit::_saveAddressBook()
if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) { if(!KIO::NetAccess::upload(fABookFile, AbbrowserSettings::fileName(), 0L)) {
emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload " emit logError(i18n("An error occurred while uploading \"%1\". You can try to upload "
"the temporary local file \"%2\" manually") "the temporary local file \"%2\" manually")
.arg(AbbrowserSettings::fileName()).arg(fABookFile)); .tqarg(AbbrowserSettings::fileName()).tqarg(fABookFile));
} }
else { else {
KIO::NetAccess::removeTempFile(fABookFile); KIO::NetAccess::removeTempFile(fABookFile);
@ -476,7 +476,7 @@ void AbbrowserConduit::showPilotAddress(const PilotAddress *pilotAddress)
} }
DEBUGKPILOT << fname << "\n" DEBUGKPILOT << fname << "\n"
<< pilotAddress->getTextRepresentation( << pilotAddress->getTextRepresentation(
fAddressAppInfo,Qt::PlainText) << endl; fAddressAppInfo,TQt::PlainText) << endl;
} }
@ -762,7 +762,7 @@ void AbbrowserConduit::slotDeletedRecord()
recordid_t id = backupRec->id(); recordid_t id = backupRec->id();
TQString uid = addresseeMap[id]; TQString uid = addresseeMap[id];
Addressee e = aBook->tqfindByUid(uid); Addressee e = aBook->findByUid(uid);
DEBUGKPILOT << fname << ": now looking at palm id: [" DEBUGKPILOT << fname << ": now looking at palm id: ["
<< id << "], kabc uid: [" << uid << "]." << endl; << id << "], kabc uid: [" << uid << "]." << endl;
@ -779,7 +779,7 @@ void AbbrowserConduit::slotDeletedRecord()
DEBUGKPILOT << fname << ": no Addressee found for this id." << endl; DEBUGKPILOT << fname << ": no Addressee found for this id." << endl;
DEBUGKPILOT << fname << "\n" DEBUGKPILOT << fname << "\n"
<< backupAddr->getTextRepresentation( << backupAddr->getTextRepresentation(
fAddressAppInfo,Qt::PlainText) << endl; fAddressAppInfo,TQt::PlainText) << endl;
if (palmRec) { if (palmRec) {
DEBUGKPILOT << fname << ": deleting from database on palm." << endl; 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 this is a first sync, we don't have a backup record, so
if(isFirstSync() || backup.isEmpty()) { 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(pc.isEmpty()) return palm;
if(palm.isEmpty()) return pc; if(palm.isEmpty()) return pc;
} else { } else {
@ -1512,7 +1512,7 @@ TQString AbbrowserConduit::_smartMergeString(const TQString &pc, const TQString
case SyncAction::ePreviousSyncOverrides: return backup; break; case SyncAction::ePreviousSyncOverrides: return backup; break;
default: break; default: break;
} }
return TQString::null; return TQString();
} }
@ -1535,9 +1535,9 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse
#define appendGen(desc, abfield, palmfield) \ #define appendGen(desc, abfield, palmfield) \
tab->append(new ResolutionItem(desc, tab->fExistItems, \ tab->append(new ResolutionItem(desc, tab->fExistItems, \
(!pcAddr.isEmpty())?(abfield):(TQString::null), \ (!pcAddr.isEmpty())?(abfield):(TQString()), \
(palmAddr)?(palmAddr->palmfield):(TQString::null), \ (palmAddr)?(palmAddr->palmfield):(TQString()), \
(backupAddr)?(backupAddr->palmfield):(TQString::null) )) (backupAddr)?(backupAddr->palmfield):(TQString()) ))
#define appendAddr(desc, abfield, palmfield) \ #define appendAddr(desc, abfield, palmfield) \
appendGen(desc, abfield, getField(palmfield)) appendGen(desc, abfield, getField(palmfield))
#define appendGenPhone(desc, abfield, palmfield) \ #define appendGenPhone(desc, abfield, palmfield) \
@ -1588,7 +1588,7 @@ bool AbbrowserConduit::_buildResolutionTable(ResolutionTable*tab, const Addresse
tab->fExistItems, tab->fExistItems,
!pcAddr.isEmpty() ? !pcAddr.isEmpty() ?
KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) : KABCSync::bestMatchedCategoryName(pcAddr.categories(), *fAddressAppInfo, category) :
TQString::null, TQString(),
palmAddrCategoryLabel, palmAddrCategoryLabel,
backupAddrCategoryLabel)); backupAddrCategoryLabel));
#undef appendGen #undef appendGen
@ -1843,7 +1843,7 @@ Addressee AbbrowserConduit::_findMatch(const PilotAddress & pilotAddress) const
DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl; DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", mapped to " << id << endl;
if(!id.isEmpty()) if(!id.isEmpty())
{ {
Addressee res(aBook->tqfindByUid(id)); Addressee res(aBook->findByUid(id));
if(!res.isEmpty()) return res; if(!res.isEmpty()) return res;
DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl; DEBUGKPILOT << fname << ": PilotRecord has id " << pilotAddress.id() << ", but could not be found in the addressbook" << endl;
} }

@ -54,6 +54,7 @@ typedef TQValueList<recordid_t> RecordIDList;
class AbbrowserConduit : public ConduitAction class AbbrowserConduit : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
AbbrowserConduit(KPilotLink *o,const char *n = 0L, AbbrowserConduit(KPilotLink *o,const char *n = 0L,
const TQStringList &a = TQStringList() ); const TQStringList &a = TQStringList() );

@ -132,7 +132,7 @@ AbbrowserWidgetSetup::~AbbrowserWidgetSetup()
#endif #endif
int fmtindex=fConfigWidget->fCustomDate->currentItem(); int fmtindex=fConfigWidget->fCustomDate->currentItem();
AbbrowserSettings::setCustomDateFormat( AbbrowserSettings::setCustomDateFormat(
(fmtindex==0)?(TQString::null):fConfigWidget->fCustomDate->currentText() ); (fmtindex==0)?(TQString()):fConfigWidget->fCustomDate->currentText() );
AbbrowserSettings::self()->writeConfig(); AbbrowserSettings::self()->writeConfig();
unmodified(); unmodified();

@ -362,7 +362,7 @@ void KABCSync::setFieldFromHHCustom(
bdate = KGlobal::locale()->readDate(value, format, &ok); bdate = KGlobal::locale()->readDate(value, format, &ok);
} }
DEBUGKPILOT << "Birthdate from " << index << "-th custom field: " DEBUGKPILOT << "Birthdate from " << index << "-th custom field: "
<< bdate.toString() << endl; << TQString(bdate.toString()) << endl;
DEBUGKPILOT << "Is Valid: " << bdate.isValid() << endl; DEBUGKPILOT << "Is Valid: " << bdate.isValid() << endl;
if (bdate.isValid()) if (bdate.isValid())
{ {
@ -437,7 +437,7 @@ TQString KABCSync::getFieldForHHOtherPhone(const KABC::Addressee & abEntry, cons
case eTTYTTDPhone: case eTTYTTDPhone:
return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number(); return abEntry.phoneNumber(KABC::PhoneNumber::Pcs).number();
default: default:
return TQString::null; return TQString();
} }
} }

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>AbbrowserWidget</class> <class>AbbrowserWidget</class>
<author>Adriaan de Groot and David Bishop</author> <author>Adriaan de Groot and David Bishop</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form2</cstring> <cstring>Form2</cstring>
</property> </property>
@ -23,14 +23,14 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -58,7 +58,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fSyncDestination</cstring> <cstring>fSyncDestination</cstring>
</property> </property>
@ -69,7 +69,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </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"> <property name="name">
<cstring>fSyncStdAbook</cstring> <cstring>fSyncStdAbook</cstring>
</property> </property>
@ -80,7 +80,7 @@
<string>&lt;qt&gt;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)&lt;/qt&gt;</string> <string>&lt;qt&gt;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)&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fSyncFile</cstring> <cstring>fSyncFile</cstring>
</property> </property>
@ -115,7 +115,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QCheckBox" row="2" column="0"> <widget class="TQCheckBox" row="2" column="0">
<property name="name"> <property name="name">
<cstring>fArchive</cstring> <cstring>fArchive</cstring>
</property> </property>
@ -128,7 +128,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -139,7 +139,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>groupBox4</cstring> <cstring>groupBox4</cstring>
</property> </property>
@ -150,7 +150,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_2_2</cstring> <cstring>textLabel1_2_2</cstring>
</property> </property>
@ -172,7 +172,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="1" column="1"> <widget class="TQComboBox" row="1" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Use KPilot's Global Setting</string> <string>Use KPilot's Global Setting</string>
@ -218,7 +218,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>textLabel1_7</cstring> <cstring>textLabel1_7</cstring>
</property> </property>
@ -250,7 +250,7 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -267,7 +267,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
@ -278,7 +278,7 @@
<string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's &amp;quot;Other&amp;quot; phone here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's &amp;quot;Other&amp;quot; phone here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="0" column="1"> <widget class="TQComboBox" row="0" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Other Phone</string> <string>Other Phone</string>
@ -334,7 +334,7 @@
<string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's &amp;quot;Other&amp;quot; phone here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's &amp;quot;Other&amp;quot; phone here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
@ -345,7 +345,7 @@
<string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's Street Address here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's Street Address here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="1" column="1"> <widget class="TQComboBox" row="1" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Preferred, then Home Address</string> <string>Preferred, then Home Address</string>
@ -363,7 +363,7 @@
<string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's Street Address here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Pilot's Street Address here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
@ -374,7 +374,7 @@
<string>&lt;qt&gt;Select which KAddressBook field should be used to store the Fax number from the Pilot here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select which KAddressBook field should be used to store the Fax number from the Pilot here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="2" column="1"> <widget class="TQComboBox" row="2" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Home Fax</string> <string>Home Fax</string>
@ -411,7 +411,7 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -422,7 +422,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -441,7 +441,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_2</cstring> <cstring>textLabel1_2</cstring>
</property> </property>
@ -452,7 +452,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_3</cstring> <cstring>textLabel1_3</cstring>
</property> </property>
@ -463,7 +463,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_4</cstring> <cstring>textLabel1_4</cstring>
</property> </property>
@ -474,7 +474,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the fourth custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="0" column="1"> <widget class="TQComboBox" row="0" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Store as Custom Field</string> <string>Store as Custom Field</string>
@ -510,7 +510,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the first custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="1" column="1"> <widget class="TQComboBox" row="1" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Store as Custom Field</string> <string>Store as Custom Field</string>
@ -546,7 +546,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the second custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="2" column="1"> <widget class="TQComboBox" row="2" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Store as Custom Field</string> <string>Store as Custom Field</string>
@ -582,7 +582,7 @@
<string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the field from this list that represents best the meaning given by your use of the third custom field on your handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="3" column="1"> <widget class="TQComboBox" row="3" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Store as Custom Field</string> <string>Store as Custom Field</string>
@ -632,7 +632,7 @@
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
</widget> </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"> <property name="name">
<cstring>textLabel1_5</cstring> <cstring>textLabel1_5</cstring>
</property> </property>
@ -646,7 +646,7 @@
<string>&lt;qt&gt;Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:&lt;br&gt; %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. &lt;/qt&gt;</string> <string>&lt;qt&gt;Select the birthdate format here, if you selected "birthdate" for any of the custom fields above. Possible placeholders are:&lt;br&gt; %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. &lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="6" column="1"> <widget class="TQComboBox" row="6" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Locale Settings</string> <string>Locale Settings</string>

@ -43,15 +43,15 @@
* as well as its child radio buttons. There are two different constructors * as well as its child radio buttons. There are two different constructors
* for them. * for them.
* Each controller has three child radio buttons, and if any of them is * 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). * controller, which is an instance of ResolutionCheckListItem, too).
**/ **/
class ResolutionCheckListItem : TQCheckListItem { class ResolutionCheckListItem : TQCheckListItem {
public: public:
ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb, ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb,
TQListView*parent); TQListView*tqparent);
ResolutionCheckListItem(TQString header, TQString text, ResolutionCheckListItem(TQString header, TQString text,
ResolutionCheckListItem*parent); ResolutionCheckListItem*tqparent);
~ResolutionCheckListItem() {}; ~ResolutionCheckListItem() {};
virtual void stateChange(bool newstate); virtual void stateChange(bool newstate);
virtual void setValue(TQString text); virtual void setValue(TQString text);
@ -73,12 +73,12 @@ protected:
ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it, ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it,
ResolutionTable*tb, TQListView*parent) : ResolutionTable*tb, TQListView*tqparent) :
TQCheckListItem(parent, TQString::null, TQCheckListItem::Controller), TQCheckListItem(tqparent, TQString(), TQCheckListItem::Controller),
fResItem(it), fResItem(it),
isController(true), isController(true),
fCaption(it?(it->fName):(TQString::null)), fCaption(it?(it->fName):(TQString())),
fText(it?(it->fResolved):(TQString::null)) fText(it?(it->fResolved):(TQString()))
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if (it && tb) if (it && tb)
@ -119,8 +119,8 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it,
} }
ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header, ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header,
ResolutionCheckListItem*parent) : ResolutionCheckListItem*tqparent) :
TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton), TQCheckListItem(tqparent, TQString(), TQCheckListItem::RadioButton),
fResItem(0L), fResItem(0L),
isController(false), isController(false),
fCaption(header), fCaption(header),
@ -133,7 +133,7 @@ void ResolutionCheckListItem::stateChange(bool newstate)
{ {
if (newstate && !isController) if (newstate && !isController)
{ {
ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(parent()); ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(tqparent());
{ {
par->setValue(fText); par->setValue(fText);
} }
@ -159,7 +159,7 @@ void ResolutionCheckListItem::setCaption(TQString caption)
void ResolutionCheckListItem::updateText() 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")), newText.tqreplace(TQRegExp(CSL1("\n")),
i18n("Denoting newlines in Address entries. No need to translate", " | ")); i18n("Denoting newlines in Address entries. No need to translate", " | "));
setText(0, newText); 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) : 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), tickleTimer(0L),
fHandle(fH), fHandle(fH),
fTable(tab) fTable(tab)
@ -319,5 +319,5 @@ void ResolutionDlg::_tickle()
*/ */
ResolutionDlg::~ResolutionDlg() 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
} }

@ -40,9 +40,10 @@ class ResolutionTable;
class ResolutionDlg : public KDialogBase class ResolutionDlg : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ResolutionDlg( TQWidget* parent=0, ResolutionDlg( TQWidget* tqparent=0,
KPilotLink*fH=0L, KPilotLink*fH=0L,
const TQString &caption=TQString(), const TQString &caption=TQString(),
const TQString &helpText=TQString(), const TQString &helpText=TQString(),

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>ResolutionDialogBase</class> <class>ResolutionDialogBase</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>widget2</cstring> <cstring>widget2</cstring>
</property> </property>
@ -19,7 +19,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fIntroText</cstring> <cstring>fIntroText</cstring>
</property> </property>
@ -30,7 +30,7 @@
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="QListView" row="1" column="0"> <widget class="TQListView" row="1" column="0">
<column> <column>
<property name="text"> <property name="text">
<string>Field</string> <string>Field</string>
@ -55,7 +55,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -66,7 +66,7 @@
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="QFrame" row="3" column="0"> <widget class="TQFrame" row="3" column="0">
<property name="name"> <property name="name">
<cstring>frame3</cstring> <cstring>frame3</cstring>
</property> </property>
@ -77,7 +77,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QPushButton" row="0" column="1"> <widget class="TQPushButton" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fKeepBoth</cstring> <cstring>fKeepBoth</cstring>
</property> </property>
@ -88,7 +88,7 @@
<string>&lt;qt&gt;Click this button to use both values, resulting in the duplication of the record.&lt;/qt&gt;</string> <string>&lt;qt&gt;Click this button to use both values, resulting in the duplication of the record.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="0" column="0"> <widget class="TQPushButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fPCValues</cstring> <cstring>fPCValues</cstring>
</property> </property>
@ -99,7 +99,7 @@
<string>&lt;qt&gt;Click this button to use the PC values for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string> <string>&lt;qt&gt;Click this button to use the PC values for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="1" column="0"> <widget class="TQPushButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fBackupValues</cstring> <cstring>fBackupValues</cstring>
</property> </property>
@ -110,7 +110,7 @@
<string>&lt;qt&gt;Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string> <string>&lt;qt&gt;Click this button to use the last sync values (old values) for synchronizing all conflicting fields in this record.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="1" column="1"> <widget class="TQPushButton" row="1" column="1">
<property name="name"> <property name="name">
<cstring>fPalmValues</cstring> <cstring>fPalmValues</cstring>
</property> </property>

@ -79,7 +79,7 @@ int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) {
#endif #endif
while (pos >= 0 && found<to) { while (pos >= 0 && found<to) {
pos = doctext.find(pattern, pos); pos = doctext.tqfind(pattern, pos);
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<"Result of search: pos="<<pos<<endl; DEBUGKPILOT<<"Result of search: pos="<<pos<<endl;
#endif #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) // TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
TQString bmkText(bmkName); TQString bmkText(bmkName);
for (int i=0; i<=rx.numCaptures(); ++i) { for (int i=0; i<=rx.numCaptures(); ++i) {
bmkText.tqreplace(CSL1("$%1").arg(i), rx.cap(i)); bmkText.tqreplace(CSL1("$%1").tqarg(i), rx.cap(i));
bmkText.tqreplace(CSL1("\\%1").arg(i), rx.cap(i)); bmkText.tqreplace(CSL1("\\%1").tqarg(i), rx.cap(i));
} }
fBookmarks.append(new docBookmark(bmkText.left(16), pos)); 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; FUNCTIONSETUP;
docdb=0L; docdb=0L;
eSortBookmarks=eSortNone; eSortBookmarks=eSortNone;
@ -195,7 +195,7 @@ TQString DOCConverter::readText() {
TQFile docfile(txtfilename); TQFile docfile(txtfilename);
if (!docfile.open(IO_ReadOnly)) 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(); return TQString();
} }
@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() {
#endif #endif
if (!docdb->isOpen()) { 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; return false;
} }
@ -520,7 +520,7 @@ bool DOCConverter::convertPDBtoTXT()
PilotRecord*headerRec = docdb->readRecordByIndex(0); PilotRecord*headerRec = docdb->readRecordByIndex(0);
if (!headerRec) 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); KPILOT_DELETE(docdb);
return false; return false;
} }
@ -540,7 +540,7 @@ bool DOCConverter::convertPDBtoTXT()
TQFile docfile(txtfilename); TQFile docfile(txtfilename);
if (!docfile.open(IO_WriteOnly)) 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); KPILOT_DELETE(docdb);
return false; return false;
} }
@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT()
DEBUGKPILOT<<"Record "<<i<<endl; DEBUGKPILOT<<"Record "<<i<<endl;
KPILOT_DELETE(rec); KPILOT_DELETE(rec);
} else { } 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); bmks.append(bmk);
KPILOT_DELETE(rec); KPILOT_DELETE(rec);
} else { } 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 // TODO: Sort the list of bookmarks according to their position
@ -592,7 +592,7 @@ bool DOCConverter::convertPDBtoTXT()
if (!bmkfile.open(IO_WriteOnly)) if (!bmkfile.open(IO_WriteOnly))
{ {
emit logError(i18n("Unable to open file %1 for the bookmarks of %2.") emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
.arg(bmkfilename).arg(docdb ->dbPathName())); .tqarg(bmkfilename).tqarg(docdb ->dbPathName()));
} }
else else
{ {

@ -105,6 +105,7 @@ class docRegExpBookmark:public docMatchBookmark {
class DOCConverter:public TQObject { class DOCConverter:public TQObject {
Q_OBJECT Q_OBJECT
TQ_OBJECT
private: private:
PilotDatabase * docdb; PilotDatabase * docdb;
TQString txtfilename; TQString txtfilename;
@ -121,7 +122,7 @@ public:
} eSortBookmarks; } eSortBookmarks;
public: public:
DOCConverter(TQObject *parent=0L, const char *name=0L); DOCConverter(TQObject *tqparent=0L, const char *name=0L);
virtual ~ DOCConverter(); virtual ~ DOCConverter();
TQString readText(); TQString readText();

@ -19,7 +19,7 @@ bin_PROGRAMS = kpalmdoc
libpalmdoc_shared_la_SOURCES = makedoc9.cc pilotDOCHead.cc pilotDOCEntry.cc pilotDOCBookmark.cc DOC-converter.cc 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_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 \ conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
$(LIB_KDEUI) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KFILE)

@ -163,7 +163,7 @@ bool DOCConduit::pcTextChanged(TQString txtfn)
KMD5 docmd5; KMD5 docmd5;
TQFile txtfile(txtfn); TQFile txtfile(txtfn);
if (txtfile.open(IO_ReadOnly)){ if (txtfile.open(IO_ReadOnly)){
docmd5.update(txtfile); docmd5.update(*TQT_TQIODEVICE(&txtfile));
TQString thisDigest(docmd5.hexDigest() /* .data() */); TQString thisDigest(docmd5.hexDigest() /* .data() */);
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<"New digest is "<<thisDigest<<endl; DEBUGKPILOT<<"New digest is "<<thisDigest<<endl;
@ -362,7 +362,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
KMD5 docmd5; KMD5 docmd5;
TQFile txtfile(docconverter.txtFilename()); TQFile txtfile(docconverter.txtFilename());
if (txtfile.open(IO_ReadOnly)) { if (txtfile.open(IO_ReadOnly)) {
docmd5.update(txtfile); docmd5.update(*TQT_TQIODEVICE(&txtfile));
TQString thisDigest(docmd5.hexDigest() /* .data() */); TQString thisDigest(docmd5.hexDigest() /* .data() */);
DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest); DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest);
DOCConduitSettings::self()->config()->sync(); DOCConduitSettings::self()->config()->sync();
@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (!postSyncAction(database, sinfo, res)) if (!postSyncAction(database, sinfo, res))
emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.") 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) if (!res)
emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") 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(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
// disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &))); // disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
// KPILOT_DELETE(database); // KPILOT_DELETE(database);
@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
else else
{ {
emit logError(i18n("Unable to open or create the database %1.") 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; return res;
} }
@ -665,7 +665,7 @@ void DOCConduit::syncDatabases() {
case eSyncDelete: case eSyncDelete:
case eSyncPDAToPC: case eSyncPDAToPC:
case eSyncPCToPDA: case eSyncPCToPDA:
emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB)); emit logMessage(i18n("Synchronizing text \"%1\"").tqarg(sinfo.handheldDB));
if (!doSync(sinfo)) { if (!doSync(sinfo)) {
// The sync could not be done, so inform the user (the error message should probably issued inside doSync) // The sync could not be done, so inform the user (the error message should probably issued inside doSync)
#ifdef DEBUG #ifdef DEBUG
@ -716,29 +716,29 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
N N | C P H N N | C P H
*/ */
if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew; if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew;
else sinfo.fPCStatus=eStatDoesntExist; else sinfo.fPCtqStatus=eStatDoesntExist;
if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew; if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew;
else sinfo.fPalmStatus=eStatDoesntExist; else sinfo.fPalmtqStatus=eStatDoesntExist;
KPILOT_DELETE(docdb); KPILOT_DELETE(docdb);
switch (eSyncDirection) { switch (eSyncDirection) {
case eSyncPDAToPC: case eSyncPDAToPC:
if (sinfo.fPalmStatus==eStatDoesntExist) if (sinfo.fPalmtqStatus==eStatDoesntExist)
sinfo.direction=eSyncDelete; sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPDAToPC; else sinfo.direction=eSyncPDAToPC;
break; break;
case eSyncPCToPDA: case eSyncPCToPDA:
if (sinfo.fPCStatus==eStatDoesntExist) if (sinfo.fPCtqStatus==eStatDoesntExist)
sinfo.direction=eSyncDelete; sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPCToPDA; else sinfo.direction=eSyncPCToPDA;
break; break;
case eSyncNone: // means actually both directions! case eSyncNone: // means actually both directions!
if (sinfo.fPCStatus==eStatNew) { if (sinfo.fPCtqStatus==eStatNew) {
if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict; if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict;
else sinfo.direction=eSyncPCToPDA; else sinfo.direction=eSyncPCToPDA;
} else { } else {
if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC; if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
else { else {
sinfo.direction=eSyncNone; sinfo.direction=eSyncNone;
#ifdef DEBUG #ifdef DEBUG
@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
} }
// Text was included in the last sync // 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)) { else if(pcTextChanged(sinfo.txtfilename)) {
sinfo.fPCStatus=eStatChanged; sinfo.fPCtqStatus=eStatChanged;
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<"PC side has changed!"<<endl; DEBUGKPILOT<<"PC side has changed!"<<endl;
#endif #endif
@ -769,12 +769,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
#endif #endif
} }
if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted; if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted;
else if (hhTextChanged(docdb)) { else if (hhTextChanged(docdb)) {
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<"Handheld side has changed!"<<endl; DEBUGKPILOT<<"Handheld side has changed!"<<endl;
#endif #endif
sinfo.fPalmStatus=eStatChanged; sinfo.fPalmtqStatus=eStatChanged;
#ifdef DEBUG #ifdef DEBUG
} else { } else {
DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl; 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 #ifdef DEBUG
DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl; DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl;
#endif #endif
@ -813,12 +813,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// to sync that direction // to sync that direction
if (eSyncDirection==eSyncPCToPDA) { if (eSyncDirection==eSyncPCToPDA) {
if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete; if (sinfo.fPCtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPCToPDA; else sinfo.direction=eSyncPCToPDA;
return true; return true;
} }
if (eSyncDirection==eSyncPDAToPC) { if (eSyncDirection==eSyncPDAToPC) {
if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete; if (sinfo.fPalmtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPDAToPC; else sinfo.direction=eSyncPDAToPC;
return true; return true;
} }
@ -830,8 +830,8 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// if either is deleted, and the other is not changed, delete // if either is deleted, and the other is not changed, delete
if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) || if ( ((sinfo.fPCtqStatus==eStatDeleted) && (sinfo.fPalmtqStatus!=eStatChanged)) ||
((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) ) ((sinfo.fPalmtqStatus==eStatDeleted) && (sinfo.fPCtqStatus!=eStatChanged)) )
{ {
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<"DB was deleted on one side and not changed on " 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 // eStatDeleted (and both not changed) have already been treated, for all
// other values in combination with eStatNone, just copy the texts. // other values in combination with eStatNone, just copy the texts.
if (sinfo.fPCStatus==eStatNone) { if (sinfo.fPCtqStatus==eStatNone) {
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<"PC side has changed!"<<endl; DEBUGKPILOT<<"PC side has changed!"<<endl;
#endif #endif
@ -851,7 +851,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
return true; return true;
} }
if (sinfo.fPalmStatus==eStatNone) { if (sinfo.fPalmtqStatus==eStatNone) {
sinfo.direction=eSyncPCToPDA; sinfo.direction=eSyncPCToPDA;
return true; return true;
} }

@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum {
eSyncDelete, eSyncDelete,
eSyncConflict eSyncConflict
}; };
typedef enum eTexStatus { typedef enum eTextqStatus {
eStatNone=0, eStatNone=0,
eStatNew=1, eStatNew=1,
eStatChanged=2, eStatChanged=2,
@ -55,6 +55,7 @@ TQString dirToString(eSyncDirectionEnum dir);
class DOCConduit:public ConduitAction { class DOCConduit:public ConduitAction {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
eSyncDirectionEnum eSyncDirection; eSyncDirectionEnum eSyncDirection;
@ -138,14 +139,14 @@ public:
txtfilename=txtfn; txtfilename=txtfn;
pdbfilename=pdbfn; pdbfilename=pdbfn;
direction=dir; direction=dir;
fPCStatus=eStatNone; fPCtqStatus=eStatNone;
fPalmStatus=eStatNone; fPalmtqStatus=eStatNone;
}; };
~docSyncInfo(){}; ~docSyncInfo(){};
TQString handheldDB, txtfilename, pdbfilename; TQString handheldDB, txtfilename, pdbfilename;
DBInfo dbinfo; DBInfo dbinfo;
eSyncDirectionEnum direction; eSyncDirectionEnum direction;
eTexStatus fPCStatus, fPalmStatus; eTextqStatus fPCtqStatus, fPalmtqStatus;
}; };

@ -39,8 +39,8 @@
#include <tqscrollview.h> #include <tqscrollview.h>
ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk ) ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk )
: KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) { : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) {
FUNCTIONSETUP; FUNCTIONSETUP;
syncInfo=sinfo; syncInfo=sinfo;
hasConflicts=false; hasConflicts=false;
@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 ); 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) // 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 ); TQButtonGroup *bgroup = new TQButtonGroup( this );
@ -138,7 +138,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
*/ */
ResolutionDialog::~ResolutionDialog() 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() { /* virtual slot */ void ResolutionDialog::slotOk() {
@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog()
KDialogBase::slotOk(); KDialogBase::slotOk();
} }
TQString eTexStatusToString(eTexStatus stat) { TQString eTexStatusToString(eTextqStatus stat) {
switch(stat) { switch(stat) {
case eStatNone: return i18n("unchanged"); case eStatNone: return i18n("unchanged");
case eStatNew: return i18n("new"); case eStatNew: return i18n("new");
@ -168,9 +168,9 @@ void ResolutionDialog::slotInfo(int index) {
int ix=cE.index; int ix=cE.index;
if (!syncInfo) return; if (!syncInfo) return;
docSyncInfo si=(*syncInfo)[ix]; docSyncInfo si=(*syncInfo)[ix];
TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); TQString text=i18n("tqStatus of the database %1:\n\n").tqarg(si.handheldDB);
text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus)); text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus));
text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus)); text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus));
KMessageBox::information(this, text, i18n("Database information")); KMessageBox::information(this, text, i18n("Database information"));
} }

@ -54,9 +54,10 @@ typedef struct conflictEntry {
class ResolutionDialog : public KDialogBase class ResolutionDialog : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: 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(); ~ResolutionDialog();
bool hasConflicts; bool hasConflicts;

@ -94,7 +94,7 @@ DOCConduitFactory::~DOCConduitFactory()
} }
else else
{ {
WARNINGKPILOT << "Couldn't cast parent to widget." << endl; WARNINGKPILOT << "Couldn't cast tqparent to widget." << endl;
return 0L; return 0L;
} }
} }
@ -107,7 +107,7 @@ DOCConduitFactory::~DOCConduitFactory()
} }
else else
{ {
WARNINGKPILOT << "Couldn't cast parent to KPilotLink" <<endl; WARNINGKPILOT << "Couldn't cast tqparent to KPilotLink" <<endl;
return 0L; return 0L;
} }
} }

@ -37,8 +37,8 @@ class KAboutData;
class DOCConduitFactory:public KLibFactory class DOCConduitFactory:public KLibFactory
{ {
Q_OBJECT
Q_OBJECT TQ_OBJECT
public: public:
DOCConduitFactory(TQObject * = 0L, const char * = 0L); DOCConduitFactory(TQObject * = 0L, const char * = 0L);
@ -55,9 +55,9 @@ public:
protected: protected:
virtual TQObject * createObject(TQObject * parent = 0, virtual TQObject * createObject(TQObject * tqparent = 0,
const char *name = 0, const char *name = 0,
const char *classname = "TQObject", const char *classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList & args = TQStringList()); const TQStringList & args = TQStringList());
private: private:

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DOCWidget</class> <class>DOCWidget</class>
<author>Reinhold Kainhofer</author> <author>Reinhold Kainhofer</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form2</cstring> <cstring>Form2</cstring>
</property> </property>
@ -31,11 +31,11 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -46,7 +46,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>
@ -60,7 +60,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fkeepPDBLocally</cstring> <cstring>fkeepPDBLocally</cstring>
</property> </property>
@ -82,7 +82,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fSyncDirection</cstring> <cstring>fSyncDirection</cstring>
</property> </property>
@ -99,7 +99,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QRadioButton" row="2" column="0"> <widget class="TQRadioButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton3</cstring> <cstring>RadioButton3</cstring>
</property> </property>
@ -113,7 +113,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton2</cstring> <cstring>RadioButton2</cstring>
</property> </property>
@ -124,7 +124,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
@ -170,7 +170,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -181,7 +181,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </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"> <property name="name">
<cstring>fCompress</cstring> <cstring>fCompress</cstring>
</property> </property>
@ -198,7 +198,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fConvertBookmarks</cstring> <cstring>fConvertBookmarks</cstring>
</property> </property>
@ -229,7 +229,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="2" column="1"> <widget class="TQCheckBox" row="2" column="1">
<property name="name"> <property name="name">
<cstring>fBookmarksInline</cstring> <cstring>fBookmarksInline</cstring>
</property> </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 &lt;* bookmarktext *&gt;. The bookmark location is set using the location of the inline tag in the text, and the name is the text between the &lt;* and the *&gt;. The inline tag (&lt;*...*&gt;) will be removed from the text.</string> <string>Check this box to create bookmarks from inline tags in the text. The inline tag consist of tags in the form &lt;* bookmarktext *&gt;. The bookmark location is set using the location of the inline tag in the text, and the name is the text between the &lt;* and the *&gt;. The inline tag (&lt;*...*&gt;) will be removed from the text.</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="5" column="0"> <widget class="TQLabel" row="5" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -254,7 +254,7 @@
<cstring>fEncoding</cstring> <cstring>fEncoding</cstring>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="3" column="1"> <widget class="TQCheckBox" row="3" column="1">
<property name="name"> <property name="name">
<cstring>fBookmarksEndtags</cstring> <cstring>fBookmarksEndtags</cstring>
</property> </property>
@ -265,7 +265,7 @@
<string>Check this box to convert tags of the form &lt;bookmarkname&gt; 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 &lt;...&gt; will then be removed from the end of the text.</string> <string>Check this box to convert tags of the form &lt;bookmarkname&gt; 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 &lt;...&gt; will then be removed from the end of the text.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="4" column="1"> <widget class="TQCheckBox" row="4" column="1">
<property name="name"> <property name="name">
<cstring>fBookmarksBmk</cstring> <cstring>fBookmarksBmk</cstring>
</property> </property>
@ -276,14 +276,14 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="5" column="1"> <widget class="TQComboBox" row="5" column="1">
<property name="name"> <property name="name">
<cstring>fEncoding</cstring> <cstring>fEncoding</cstring>
</property> </property>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -311,7 +311,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fNoConversionOfBmksOnly</cstring> <cstring>fNoConversionOfBmksOnly</cstring>
</property> </property>
@ -322,7 +322,7 @@
<string>&lt;qt&gt;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).&lt;/qt&gt;</string> <string>&lt;qt&gt;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).&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fPCBookmarks</cstring> <cstring>fPCBookmarks</cstring>
</property> </property>
@ -333,7 +333,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>radioButton8</cstring> <cstring>radioButton8</cstring>
</property> </property>
@ -347,7 +347,7 @@
<string>&lt;qt&gt;Check this box to avoid converting Palm DOC bookmarks to inline tags or to a bookmark file.&lt;/qt&gt;</string> <string>&lt;qt&gt;Check this box to avoid converting Palm DOC bookmarks to inline tags or to a bookmark file.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>radioButton11</cstring> <cstring>radioButton11</cstring>
</property> </property>
@ -364,7 +364,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="2" column="0"> <widget class="TQRadioButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>radioButton9</cstring> <cstring>radioButton9</cstring>
</property> </property>
@ -382,7 +382,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -393,7 +393,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QButtonGroup"> <widget class="TQButtonGroup">
<property name="name"> <property name="name">
<cstring>fConflictResolution</cstring> <cstring>fConflictResolution</cstring>
</property> </property>
@ -410,7 +410,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>radioButton12</cstring> <cstring>radioButton12</cstring>
</property> </property>
@ -424,7 +424,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton5</cstring> <cstring>RadioButton5</cstring>
</property> </property>
@ -438,7 +438,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="2" column="0"> <widget class="TQRadioButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton4</cstring> <cstring>RadioButton4</cstring>
</property> </property>
@ -452,7 +452,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="3" column="0"> <widget class="TQRadioButton" row="3" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton7</cstring> <cstring>RadioButton7</cstring>
</property> </property>
@ -471,7 +471,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>fAlwaysUseResolution</cstring> <cstring>fAlwaysUseResolution</cstring>
</property> </property>

@ -54,8 +54,8 @@
#include "kpalmdocSettings.h" #include "kpalmdocSettings.h"
ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption) ConverterDlg::ConverterDlg( TQWidget *tqparent, const TQString& caption)
: KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1, : KDialogBase( tqparent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1,
KDialogBase::Close, true, i18n("&About")) KDialogBase::Close, true, i18n("&About"))
{ {
TQWidget *page = makeHBoxMainWidget(); TQWidget *page = makeHBoxMainWidget();
@ -78,7 +78,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
ConverterDlg::~ConverterDlg() 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() void ConverterDlg::writeSettings()
{ {
@ -175,8 +175,8 @@ void ConverterDlg::slotToText()
int res=KMessageBox::questionYesNo(this, int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl) "<br>Use folder <em>%2</em> instead?</qt>").tqarg(pdburl)
.arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) if (res==KMessageBox::Yes)
{ {
pdburl=pdbinfo.dirPath(true); pdburl=pdbinfo.dirPath(true);
@ -191,7 +191,7 @@ void ConverterDlg::slotToText()
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " i18n("<qt>The folder <em>%1</em> for "
"the handheld database files is not a valid " "the handheld database files is not a valid "
"folder.</qt>").arg(pdburl)); "folder.</qt>").tqarg(pdburl));
return; return;
} }
@ -200,7 +200,7 @@ void ConverterDlg::slotToText()
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " i18n("<qt>The folder <em>%1</em> for "
"the handheld database files is not a " "the handheld database files is not a "
"valid directory.</qt>").arg(pdburl)); "valid directory.</qt>").tqarg(pdburl));
return; return;
} }
@ -211,8 +211,8 @@ void ConverterDlg::slotToText()
int res=KMessageBox::questionYesNo(this, int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl)
.arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) { if (res==KMessageBox::Yes) {
txturl=txtinfo.dirPath(true); txturl=txtinfo.dirPath(true);
txtinfo.setFile(txturl); txtinfo.setFile(txturl);
@ -227,7 +227,7 @@ void ConverterDlg::slotToText()
if (!txtinfo.isDir()) { if (!txtinfo.isDir()) {
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " 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; return;
} }
@ -265,7 +265,7 @@ void ConverterDlg::slotToText()
if (!pdbinfo.isFile() || !pdbinfo.exists()) if (!pdbinfo.isFile() || !pdbinfo.exists())
{ {
KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
"exist.</qt>").arg(pdburl)); "exist.</qt>").tqarg(pdburl));
return; return;
} }
@ -274,13 +274,13 @@ void ConverterDlg::slotToText()
if (!txtinfo.isFile()) if (!txtinfo.isFile())
{ {
KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the " 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; return;
}*/ }*/
if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(), if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(),
txtinfo.dirPath(true), txtinfo.fileName(), &conv) ) 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, int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl) "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl)
.arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) if (res==KMessageBox::Yes)
{ {
txturl=txtinfo.dirPath(true); txturl=txtinfo.dirPath(true);
@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB()
{ {
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for " 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; return;
} }
@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB()
i18n("<qt>You selected to sync folders, " i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)." "but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>") "<br>Use folder <em>%2</em> instead?</qt>")
.arg(pdburl) .tqarg(pdburl)
.arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel()); .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) { if (res==KMessageBox::Yes) {
pdburl=pdbinfo.dirPath(true); pdburl=pdbinfo.dirPath(true);
pdbinfo.setFile(pdburl); pdbinfo.setFile(pdburl);
@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB()
} }
if (!pdbinfo.isDir()) { if (!pdbinfo.isDir()) {
KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for " 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; return;
} }
@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB()
if (!txtinfo.isFile() || !txtinfo.exists()) if (!txtinfo.isFile() || !txtinfo.exists())
{ {
KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not " KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
"exist.</qt>").arg(txturl)); "exist.</qt>").tqarg(txturl));
return; return;
} }
if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(), if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(),
pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) ) 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 || if (!dbfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this, (KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>") 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); PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb) if (pdbdb)
@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
} }
if ( !res && verbose ) 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 else
@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
if (!txtfileinfo.exists() || !askOverwrite || if (!txtfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this, (KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>") 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); PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb) if (pdbdb)
@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
} }
if ( !res && verbose ) 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 else

@ -35,9 +35,10 @@ class DOCConverter;
class ConverterDlg : public KDialogBase class ConverterDlg : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ConverterDlg( TQWidget *parent=0, const TQString& caption=0); ConverterDlg( TQWidget *tqparent=0, const TQString& caption=0);
~ConverterDlg(); ~ConverterDlg();
protected slots: protected slots:

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConverterDlgBase</class> <class>ConverterDlgBase</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>ConverterDlgBase</cstring> <cstring>ConverterDlgBase</cstring>
</property> </property>
@ -16,11 +16,11 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -31,7 +31,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fPdbLabel</cstring> <cstring>fPdbLabel</cstring>
</property> </property>
@ -50,7 +50,7 @@
<cstring>fPDBDir</cstring> <cstring>fPDBDir</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fTextLabel</cstring> <cstring>fTextLabel</cstring>
</property> </property>
@ -69,7 +69,7 @@
<cstring>fTXTDir</cstring> <cstring>fTXTDir</cstring>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fDirectories</cstring> <cstring>fDirectories</cstring>
</property> </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> <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> </property>
</widget> </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"> <property name="name">
<cstring>fAskOverwrite</cstring> <cstring>fAskOverwrite</cstring>
</property> </property>
@ -93,7 +93,7 @@
<string>&amp;Ask before overwriting files</string> <string>&amp;Ask before overwriting files</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fVerbose</cstring> <cstring>fVerbose</cstring>
</property> </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> <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> </property>
</widget> </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"> <property name="name">
<cstring>fEncoding</cstring> <cstring>fEncoding</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="5" column="0"> <widget class="TQLabel" row="5" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -160,7 +160,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -222,7 +222,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="2" column="1"> <widget class="TQCheckBox" row="2" column="1">
<property name="name"> <property name="name">
<cstring>fBookmarksInline</cstring> <cstring>fBookmarksInline</cstring>
</property> </property>
@ -236,7 +236,7 @@
<string>When a &lt;* bookmarktext *&gt; appears somewhere in the text, a bookmark will be set at this position, and the text between the &lt;* and the *&gt; will be used as bookmark name. The &lt;*...*&gt; will be removed from the text.</string> <string>When a &lt;* bookmarktext *&gt; appears somewhere in the text, a bookmark will be set at this position, and the text between the &lt;* and the *&gt; will be used as bookmark name. The &lt;*...*&gt; will be removed from the text.</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="3" column="1"> <widget class="TQCheckBox" row="3" column="1">
<property name="name"> <property name="name">
<cstring>fBookmarksEndtags</cstring> <cstring>fBookmarksEndtags</cstring>
</property> </property>
@ -247,7 +247,7 @@
<string>Tags of the form &lt;bookmarkname&gt; at the end of the text will be used to search the text for the pattern between the &lt; and &gt;. Whenever "bookmarkname" appears in the text, a bookmark will be set there. The endtags &lt;...&gt; will then be removed from the end of the text.</string> <string>Tags of the form &lt;bookmarkname&gt; at the end of the text will be used to search the text for the pattern between the &lt; and &gt;. Whenever "bookmarkname" appears in the text, a bookmark will be set there. The endtags &lt;...&gt; will then be removed from the end of the text.</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fCompress</cstring> <cstring>fCompress</cstring>
</property> </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> <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> </property>
</widget> </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"> <property name="name">
<cstring>fConvertBookmarks</cstring> <cstring>fConvertBookmarks</cstring>
</property> </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> <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> </property>
</widget> </widget>
<widget class="QCheckBox" row="4" column="1"> <widget class="TQCheckBox" row="4" column="1">
<property name="name"> <property name="name">
<cstring>fBookmarksBmk</cstring> <cstring>fBookmarksBmk</cstring>
</property> </property>
@ -308,7 +308,7 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -336,7 +336,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fPCBookmarks</cstring> <cstring>fPCBookmarks</cstring>
</property> </property>
@ -347,7 +347,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>radioButton9</cstring> <cstring>radioButton9</cstring>
</property> </property>
@ -361,7 +361,7 @@
<number>1</number> <number>1</number>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>radioButton8</cstring> <cstring>radioButton8</cstring>
</property> </property>
@ -375,7 +375,7 @@
<number>0</number> <number>0</number>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="2" column="0"> <widget class="TQRadioButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>radioButton10</cstring> <cstring>radioButton10</cstring>
</property> </property>
@ -386,7 +386,7 @@
<string>Convert as &amp;end tags</string> <string>Convert as &amp;end tags</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="3" column="0"> <widget class="TQRadioButton" row="3" column="0">
<property name="name"> <property name="name">
<cstring>radioButton11</cstring> <cstring>radioButton11</cstring>
</property> </property>

@ -15,7 +15,7 @@ conduit_knotes_la_SOURCES = \
knotes-action.cc \ knotes-action.cc \
setup_base.ui 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) conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
kde_kcfg_DATA = knotesconduit.kcfg kde_kcfg_DATA = knotesconduit.kcfg

@ -79,7 +79,7 @@ public:
int memo() const { return memoId; } ; int memo() const { return memoId; } ;
KNoteID_t note() const { return noteId; } ; KNoteID_t note() const { return noteId; } ;
inline bool valid() const { return (memoId>0) && (!noteId.isEmpty()) ; } ; 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 findNote(const TQValueList<NoteAndMemo> &,KNoteID_pt note);
static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo); static NoteAndMemo findMemo(const TQValueList<NoteAndMemo> &,int memo);
@ -234,7 +234,7 @@ KNotesAction::KNotesAction(KPilotLink *o,
} }
fP->fTimer = new TQTimer(this); fP->fTimer = new TQTimer(this);
fActionStatus = Init; fActiontqStatus = Init;
// this is not needed. As it is done in the initstate in process(); // this is not needed. As it is done in the initstate in process();
// resetIndexes(); // resetIndexes();
@ -269,7 +269,7 @@ bool KNotesAction::openKNotesResource()
} }
else 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; return false;
} }
} }
@ -308,9 +308,9 @@ void KNotesAction::listNotes()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
DEBUGKPILOT << fname << ": Now in state " << fActionStatus << endl; DEBUGKPILOT << fname << ": Now in state " << fActiontqStatus << endl;
switch(fActionStatus) switch(fActiontqStatus)
{ {
case Init: case Init:
resetIndexes(); resetIndexes();
@ -321,16 +321,16 @@ void KNotesAction::listNotes()
case SyncAction::SyncMode::eBackup: case SyncAction::SyncMode::eBackup:
case SyncAction::SyncMode::eRestore: case SyncAction::SyncMode::eRestore:
// Impossible! // Impossible!
fActionStatus = Done; fActiontqStatus = Done;
break; break;
case SyncAction::SyncMode::eCopyHHToPC : case SyncAction::SyncMode::eCopyHHToPC :
listNotes(); // Debugging listNotes(); // Debugging
fActionStatus = MemosToKNotes; fActiontqStatus = MemosToKNotes;
break; break;
case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eHotSync:
case SyncAction::SyncMode::eFullSync: case SyncAction::SyncMode::eFullSync:
case SyncAction::SyncMode::eCopyPCToHH: case SyncAction::SyncMode::eCopyPCToHH:
fActionStatus = ModifiedNotesToPilot; fActiontqStatus = ModifiedNotesToPilot;
break; break;
} }
break; break;
@ -338,14 +338,14 @@ void KNotesAction::listNotes()
if (modifyNoteOnPilot()) if (modifyNoteOnPilot())
{ {
resetIndexes(); resetIndexes();
fActionStatus = DeleteNotesOnPilot; fActiontqStatus = DeleteNotesOnPilot;
} }
break; break;
case DeleteNotesOnPilot: case DeleteNotesOnPilot:
if (deleteNoteOnPilot()) if (deleteNoteOnPilot())
{ {
resetIndexes(); resetIndexes();
fActionStatus = NewNotesToPilot; fActiontqStatus = NewNotesToPilot;
} }
break; break;
case NewNotesToPilot : case NewNotesToPilot :
@ -359,14 +359,14 @@ void KNotesAction::listNotes()
case SyncAction::SyncMode::eRestore: case SyncAction::SyncMode::eRestore:
case SyncAction::SyncMode::eCopyHHToPC : case SyncAction::SyncMode::eCopyHHToPC :
// Impossible! // Impossible!
fActionStatus = Done; fActiontqStatus = Done;
break; break;
case SyncAction::SyncMode::eHotSync: case SyncAction::SyncMode::eHotSync:
case SyncAction::SyncMode::eFullSync: case SyncAction::SyncMode::eFullSync:
fActionStatus = MemosToKNotes; fActiontqStatus = MemosToKNotes;
break; break;
case SyncAction::SyncMode::eCopyPCToHH: case SyncAction::SyncMode::eCopyPCToHH:
fActionStatus = Cleanup; fActiontqStatus = Cleanup;
break; break;
} }
} }
@ -374,7 +374,7 @@ void KNotesAction::listNotes()
case MemosToKNotes : case MemosToKNotes :
if (syncMemoToKNotes()) if (syncMemoToKNotes())
{ {
fActionStatus=Cleanup; fActiontqStatus=Cleanup;
} }
break; break;
case Cleanup : case Cleanup :
@ -791,7 +791,7 @@ void KNotesAction::cleanupMemos()
KNotesConduitSettings::setMemoIds(memos); KNotesConduitSettings::setMemoIds(memos);
KNotesConduitSettings::self()->writeConfig(); KNotesConduitSettings::self()->writeConfig();
fActionStatus=Done; fActiontqStatus=Done;
fDatabase->cleanup(); fDatabase->cleanup();
fDatabase->resetSyncFlags(); fDatabase->resetSyncFlags();
fLocalDatabase->cleanup(); fLocalDatabase->cleanup();
@ -848,23 +848,23 @@ void KNotesAction::cleanupMemos()
/* virtual */ TQString KNotesAction::statusString() const /* virtual */ TQString KNotesAction::statusString() const
{ {
switch(fActionStatus) switch(fActiontqStatus)
{ {
case Init : return CSL1("Init"); case Init : return CSL1("Init");
case NewNotesToPilot : case NewNotesToPilot :
return CSL1("NewNotesToPilot key=%1"); return CSL1("NewNotesToPilot key=%1");
// TODO DCOP_REMOVAL .arg(fP->fIndex.key()); // TODO DCOP_REMOVAL .tqarg(fP->fIndex.key());
case ModifiedNotesToPilot : case ModifiedNotesToPilot :
return CSL1("ModifiedNotesToPilot key=%1"); return CSL1("ModifiedNotesToPilot key=%1");
//TODO DCOP_REMOVAL .arg(fP->fIndex.key()); //TODO DCOP_REMOVAL .tqarg(fP->fIndex.key());
case MemosToKNotes : case MemosToKNotes :
return CSL1("MemosToKNotes rec=%1") return CSL1("MemosToKNotes rec=%1")
.arg(fP->fRecordIndex); .tqarg(fP->fRecordIndex);
case Cleanup : return CSL1("Cleanup"); case Cleanup : return CSL1("Cleanup");
case Done : case Done :
return CSL1("Done"); return CSL1("Done");
default : default :
return CSL1("Unknown (%1)").arg(fActionStatus); return CSL1("Unknown (%1)").tqarg(fActiontqStatus);
} }
} }

@ -37,6 +37,7 @@ class PilotMemo;
class KNotesAction : public ConduitAction class KNotesAction : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
KNotesAction( KNotesAction(
KPilotLink *o, KPilotLink *o,
@ -44,7 +45,7 @@ public:
const TQStringList &a = TQStringList() ); const TQStringList &a = TQStringList() );
virtual ~KNotesAction(); virtual ~KNotesAction();
enum Status { Init, enum tqStatus { Init,
ModifiedNotesToPilot, ModifiedNotesToPilot,
DeleteNotesOnPilot, DeleteNotesOnPilot,
NewNotesToPilot, NewNotesToPilot,

@ -123,7 +123,7 @@ KNotesConduitFactory::~KNotesConduitFactory()
else else
{ {
WARNINGKPILOT WARNINGKPILOT
<< "Couldn't cast parent to KPilotDeviceLink" << "Couldn't cast tqparent to KPilotDeviceLink"
<< endl; << endl;
return 0L; return 0L;
} }

@ -37,6 +37,7 @@ class KAboutData;
class KNotesConduitFactory : public KLibFactory class KNotesConduitFactory : public KLibFactory
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
KNotesConduitFactory(TQObject * = 0L,const char * = 0L); KNotesConduitFactory(TQObject * = 0L,const char * = 0L);
@ -50,9 +51,9 @@ public:
// break its value. We store group and entry keys in here. // break its value. We store group and entry keys in here.
protected: protected:
virtual TQObject* createObject( TQObject* parent = 0, virtual TQObject* createObject( TQObject* tqparent = 0,
const char* name = 0, const char* name = 0,
const char* classname = "TQObject", const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
KInstance *fInstance; KInstance *fInstance;

@ -36,7 +36,7 @@ class KNotesWidget;
class KNotesConfigBase : public ConduitConfigBase class KNotesConfigBase : public ConduitConfigBase
{ {
public: public:
KNotesConfigBase(TQWidget *parent, const char *name); KNotesConfigBase(TQWidget *tqparent, const char *name);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>KNotesWidget</class> <class>KNotesWidget</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>KNotesWidget</cstring> <cstring>KNotesWidget</cstring>
</property> </property>
@ -22,11 +22,11 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget"> <widget class="TQTabWidget">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -37,7 +37,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fDeleteNoteForMemo</cstring> <cstring>fDeleteNoteForMemo</cstring>
</property> </property>
@ -51,7 +51,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fSuppressConfirm</cstring> <cstring>fSuppressConfirm</cstring>
</property> </property>

@ -13,6 +13,6 @@ kde_kcfg_DATA = malconduit.kcfg
kde_module_LTLIBRARIES = conduit_mal.la 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_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) conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_KDEUI)

@ -217,7 +217,7 @@ bool MALConduit::skip()
syncMessage = i18n("No proxy server is set."); syncMessage = i18n("No proxy server is set.");
break; break;
} }
syncMessage = i18n("Using proxy server: %1").arg(proxyServer); syncMessage = i18n("Using proxy server: %1").tqarg(proxyServer);
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<< DEBUGKPILOT<<" Using HTTP proxy server \""<<proxyServer<<
@ -259,7 +259,7 @@ bool MALConduit::skip()
syncMessage = i18n("No SOCKS proxy is set."); syncMessage = i18n("No SOCKS proxy is set.");
break; break;
} }
syncMessage = i18n("Using SOCKS proxy: %1").arg(proxyServer); syncMessage = i18n("Using SOCKS proxy: %1").tqarg(proxyServer);
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl; DEBUGKPILOT<<" Using SOCKS proxy server \""<<proxyServer<<"\", Port "<<proxyPort<<", User "<<MALConduitSettings::proxyUser()<<", Password "<<( (MALConduitSettings::proxyPassword().isEmpty())?TQString("not "):TQString() )<<"set"<<endl;
#endif #endif

@ -38,6 +38,7 @@
class MALConduit : public ConduitAction class MALConduit : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
MALConduit( MALConduit(
KPilotLink *o, KPilotLink *o,

@ -115,7 +115,7 @@ MALConduitFactory::~MALConduitFactory()
else else
{ {
WARNINGKPILOT WARNINGKPILOT
<< "Couldn't cast parent to widget." << "Couldn't cast tqparent to widget."
<< endl; << endl;
return 0L; return 0L;
} }
@ -132,7 +132,7 @@ MALConduitFactory::~MALConduitFactory()
else else
{ {
WARNINGKPILOT WARNINGKPILOT
<< "Couldn't cast parent to KPilotLink" << "Couldn't cast tqparent to KPilotLink"
<< endl; << endl;
return 0L; return 0L;
} }

@ -40,6 +40,7 @@ class KAboutData;
class MALConduitFactory : public KLibFactory class MALConduitFactory : public KLibFactory
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
MALConduitFactory(TQObject * = 0L,const char * = 0L); MALConduitFactory(TQObject * = 0L,const char * = 0L);
@ -48,9 +49,9 @@ public:
static KAboutData *about() { return fAbout; } ; static KAboutData *about() { return fAbout; } ;
protected: protected:
virtual TQObject* createObject( TQObject* parent = 0, virtual TQObject* createObject( TQObject* tqparent = 0,
const char* name = 0, const char* name = 0,
const char* classname = "TQObject", const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ); const TQStringList &args = TQStringList() );
private: private:
KInstance *fInstance; KInstance *fInstance;

@ -150,7 +150,7 @@ MALWidgetSetup::~MALWidgetSetup()
fConfigWidget->proxyCustomPort->setValue(proxyPortNr); fConfigWidget->proxyCustomPort->setValue(proxyPortNr);
} }
fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser()); fConfigWidget->proxyUserName->setText(MALConduitSettings::proxyUser());
fConfigWidget->proxyPassword->setText(TQString::null); fConfigWidget->proxyPassword->setText(TQString());
fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword()); fConfigWidget->proxyPassword->insert(MALConduitSettings::proxyPassword());
#ifdef DEBUG #ifdef DEBUG

@ -40,6 +40,7 @@ class MALWidget;
class MALWidgetSetup : public ConduitConfigBase class MALWidgetSetup : public ConduitConfigBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
MALWidgetSetup(TQWidget *,const char *); MALWidgetSetup(TQWidget *,const char *);
virtual ~MALWidgetSetup(); virtual ~MALWidgetSetup();

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>MALWidget</class> <class>MALWidget</class>
<author>Reinhold Kainhofer</author> <author>Reinhold Kainhofer</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>MalWidget</cstring> <cstring>MalWidget</cstring>
</property> </property>
@ -23,14 +23,14 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -41,7 +41,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>syncTime</cstring> <cstring>syncTime</cstring>
</property> </property>
@ -61,7 +61,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
@ -78,7 +78,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1_2</cstring> <cstring>RadioButton1_2</cstring>
</property> </property>
@ -92,7 +92,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="2" column="0"> <widget class="TQRadioButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1_3</cstring> <cstring>RadioButton1_3</cstring>
</property> </property>
@ -103,7 +103,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="3" column="0"> <widget class="TQRadioButton" row="3" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1_4</cstring> <cstring>RadioButton1_4</cstring>
</property> </property>
@ -114,7 +114,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="4" column="0"> <widget class="TQRadioButton" row="4" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1_5</cstring> <cstring>RadioButton1_5</cstring>
</property> </property>
@ -146,7 +146,7 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -157,7 +157,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QButtonGroup"> <widget class="TQButtonGroup">
<property name="name"> <property name="name">
<cstring>proxyType</cstring> <cstring>proxyType</cstring>
</property> </property>
@ -177,7 +177,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QRadioButton"> <widget class="TQRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton8</cstring> <cstring>RadioButton8</cstring>
</property> </property>
@ -191,7 +191,7 @@
<string>&lt;qt&gt;Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select this option if you do not want KPilot to use a proxy server. Use this option if you connect to the internet directly.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="TQRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton8_2</cstring> <cstring>RadioButton8_2</cstring>
</property> </property>
@ -202,7 +202,7 @@
<string>&lt;qt&gt;Select this option if you want KPilot to use a HTTP proxy.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select this option if you want KPilot to use a HTTP proxy.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="TQRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton8_2_2</cstring> <cstring>RadioButton8_2_2</cstring>
</property> </property>
@ -215,7 +215,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>proxyServerInformation</cstring> <cstring>proxyServerInformation</cstring>
</property> </property>
@ -252,7 +252,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>proxyCustomPortCheck</cstring> <cstring>proxyCustomPortCheck</cstring>
</property> </property>
@ -263,7 +263,7 @@
<string>Check this box to use a non-standard proxy port.</string> <string>Check this box to use a non-standard proxy port.</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>
@ -316,7 +316,7 @@
<string>&lt;qt&gt;If your proxy requires authentication, enter your password here.&lt;/qt&gt;</string> <string>&lt;qt&gt;If your proxy requires authentication, enter your password here.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>proxyUserName</cstring> <cstring>proxyUserName</cstring>
</property> </property>
@ -324,7 +324,7 @@
<string>&lt;qt&gt;If your proxy requires authentication, enter your username here.&lt;/qt&gt;</string> <string>&lt;qt&gt;If your proxy requires authentication, enter your username here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="5" column="0"> <widget class="TQLabel" row="5" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel2_2</cstring> <cstring>TextLabel2_2</cstring>
</property> </property>
@ -335,7 +335,7 @@
<cstring>proxyPassword</cstring> <cstring>proxyPassword</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
@ -363,7 +363,7 @@
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
</widget> </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"> <property name="name">
<cstring>proxyExclude</cstring> <cstring>proxyExclude</cstring>
</property> </property>
@ -371,7 +371,7 @@
<string>&lt;qt&gt;Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: &lt;br&gt;&lt;i&gt;localhost,127.0.0.1,.lan&lt;/i&gt;&lt;qt&gt;</string> <string>&lt;qt&gt;Enter a list of MAL servers that do not need the use of a proxy here, separated with commas, e.g: &lt;br&gt;&lt;i&gt;localhost,127.0.0.1,.lan&lt;/i&gt;&lt;qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -406,7 +406,7 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -423,7 +423,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QGroupBox" row="1" column="0"> <widget class="TQGroupBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>GroupBox1_2</cstring> <cstring>GroupBox1_2</cstring>
</property> </property>
@ -443,7 +443,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </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"> <property name="name">
<cstring>TextLabel1_2</cstring> <cstring>TextLabel1_2</cstring>
</property> </property>
@ -454,7 +454,7 @@
<cstring>malServerName</cstring> <cstring>malServerName</cstring>
</property> </property>
</widget> </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"> <property name="name">
<cstring>malCustomPortCheck</cstring> <cstring>malCustomPortCheck</cstring>
</property> </property>
@ -501,12 +501,12 @@
<cstring>malServerName</cstring> <cstring>malServerName</cstring>
</property> </property>
</widget> </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"> <property name="name">
<cstring>malUserName</cstring> <cstring>malUserName</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel2_2_2</cstring> <cstring>TextLabel2_2_2</cstring>
</property> </property>
@ -517,7 +517,7 @@
<cstring>malPassword</cstring> <cstring>malPassword</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>textLabel</cstring> <cstring>textLabel</cstring>
</property> </property>
@ -566,7 +566,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1_3</cstring> <cstring>TextLabel1_3</cstring>
</property> </property>

@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = conduit_memofile.la
conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \ conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
memofile-factory.cc memofile.cc memofiles.cc memofile-conduit.cc 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) conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KFILE)
kde_kcfg_DATA = memofileconduit.kcfg kde_kcfg_DATA = memofileconduit.kcfg

@ -31,7 +31,7 @@
// Only include what we really need: // Only include what we really need:
// First UNIX system stuff, then std C++, // 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()); fCtrPC->setStartCount(_memofiles->count());
setFirstSync( _memofiles->isFirstSync() ); 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() ) { if ( (syncMode() == SyncAction::SyncMode::eCopyHHToPC) || _memofiles->isFirstSync() ) {
addSyncLogEntry(i18n(" Copying Pilot to PC...")); addSyncLogEntry(i18n(" Copying Pilot to PC..."));
@ -368,7 +368,7 @@ void MemofileConduit::getModifiedFromPilot()
{ {
FUNCTIONSETUP; 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; Pilot::RecordIDList::iterator it;
for ( it = ids.begin(); it != ids.end(); ++it ) for ( it = ids.begin(); it != ids.end(); ++it )
{ {
if (!_memofiles->find(*it)) if (!_memofiles->tqfind(*it))
{ {
DEBUGKPILOT << fname DEBUGKPILOT << fname
<< "Deleting record with ID "<< *it <<" from handheld " << "Deleting record with ID "<< *it <<" from handheld "

@ -37,6 +37,7 @@ class PilotMemo;
class MemofileConduit : public ConduitAction class MemofileConduit : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
MemofileConduit(KPilotLink *, MemofileConduit(KPilotLink *,
const char *name=0L, const char *name=0L,
@ -52,8 +53,8 @@ protected slots:
private: private:
// configuration settings... // configuration settings...
QString _DEFAULT_MEMODIR; TQString _DEFAULT_MEMODIR;
QString _memo_directory; TQString _memo_directory;
bool _sync_private; bool _sync_private;
PilotMemoInfo *fMemoAppInfo; PilotMemoInfo *fMemoAppInfo;

@ -46,7 +46,7 @@
class MemofileConduitConfig : public ConduitConfigBase class MemofileConduitConfig : public ConduitConfigBase
{ {
public: public:
MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L); MemofileConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();
protected: protected:

@ -32,7 +32,7 @@
// Only include what we really need: // Only include what we really need:
// First UNIX system stuff, then std C++, // First UNIX system stuff, then std C++,
// then Qt, then KDE, then local includes. // then TQt, then KDE, then local includes.
// //
// //

@ -34,7 +34,7 @@
<UML:Operation visibility="protected" xmi.id="28" type="void" name="process" /> <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="43" type="bool" name="readConfig" />
<UML:Operation visibility="private" xmi.id="44" type="void" name="getAppInfo" /> <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:Parameter visibility="public" xmi.id="46" value="" type="int" name="category" />
</UML:Operation> </UML:Operation>
<UML:Operation visibility="private" xmi.id="47" type="bool" name="initializeFromPilot" /> <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="50" type="bool" name="initializeFromFilesystem" />
<UML:Operation visibility="private" xmi.id="51" type="bool" name="initializeMemofileList" /> <UML:Operation visibility="private" xmi.id="51" type="bool" name="initializeMemofileList" />
<UML:Operation visibility="private" xmi.id="52" type="bool" name="checkDirectory" > <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>
<UML:Operation visibility="private" xmi.id="54" type="bool" name="ensureFilesystemReady" /> <UML:Operation visibility="private" xmi.id="54" type="bool" name="ensureFilesystemReady" />
<UML:Operation visibility="private" xmi.id="55" type="bool" name="copyHHToPC" /> <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&amp;" name="fileName" /> <UML:Parameter visibility="public" xmi.id="60" value="" type="const QString&amp;" name="fileName" />
<UML:Parameter visibility="public" xmi.id="61" value="" type="Memofile*" name="theMemo" /> <UML:Parameter visibility="public" xmi.id="61" value="" type="Memofile*" name="theMemo" />
</UML:Operation> </UML:Operation>
<UML:Attribute visibility="private" xmi.id="29" value="" type="QString" name="_DEFAULT_MEMODIR" /> <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="QString" name="_memo_directory" /> <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="31" value="" type="bool" name="_sync_private" />
<UML:Attribute visibility="private" xmi.id="32" value="" type="QPtrList&lt; PilotMemo >" name="fMemoList" /> <UML:Attribute visibility="private" xmi.id="32" value="" type="QPtrList&lt; PilotMemo >" name="fMemoList" />
<UML:Attribute visibility="private" xmi.id="33" value="" type="struct MemoAppInfo" name="fMemoAppInfo" /> <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="40" value="" type="int" name="fCounter" />
<UML:Attribute visibility="private" xmi.id="41" value="" type="int" name="fDeleteCounter" /> <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: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="19" name="Init" />
<UML:EnumerationLiteral visibility="public" xmi.id="20" name="ModifiedFilesToPilot" /> <UML:EnumerationLiteral visibility="public" xmi.id="20" name="ModifiedFilesToPilot" />
<UML:EnumerationLiteral visibility="public" xmi.id="21" name="DeleteFilesOnPilot" /> <UML:EnumerationLiteral visibility="public" xmi.id="21" name="DeleteFilesOnPilot" />
@ -79,7 +79,7 @@
<UML:Class visibility="public" xmi.id="63" name="Memofiles" > <UML:Class visibility="public" xmi.id="63" name="Memofiles" >
<UML:Operation visibility="public" xmi.id="80" type="Memofiles" 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="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>
<UML:Operation visibility="public" xmi.id="87" type="void" name="load" > <UML:Operation visibility="public" xmi.id="87" type="void" name="load" >
<UML:Parameter visibility="public" xmi.id="88" value="" type="bool" name="loadAll" /> <UML:Parameter visibility="public" xmi.id="88" value="" type="bool" name="loadAll" />
@ -92,39 +92,39 @@
</UML:Operation> </UML:Operation>
<UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" /> <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="98" type="void" name="loadIds" />
<UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" > <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="tqfind" >
<UML:Parameter visibility="public" xmi.id="100" value="" type="QString" name="category" /> <UML:Parameter visibility="public" xmi.id="100" value="" type=TQSTRING_OBJECT_NAME_STRING name="category" />
<UML:Parameter visibility="public" xmi.id="101" value="" type="QString" name="filename" /> <UML:Parameter visibility="public" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
</UML:Operation> </UML:Operation>
<UML:Operation visibility="public" xmi.id="102" type="void" name="addModified" > <UML:Operation visibility="public" xmi.id="102" type="void" name="addModified" >
<UML:Parameter visibility="public" xmi.id="103" value="" type="PilotMemo *" name="memo" /> <UML:Parameter visibility="public" xmi.id="103" value="" type="PilotMemo *" name="memo" />
</UML:Operation> </UML:Operation>
<UML:Operation visibility="public" xmi.id="104" type="QPtrList&lt;Memofile>" name="getModified" /> <UML:Operation visibility="public" xmi.id="104" type="QPtrList&lt;Memofile>" name="getModified" />
<UML:Attribute visibility="private" xmi.id="83" value="" type="QMap" name="_categories" /> <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&lt;Memofile>" name="_memofiles" /> <UML:Attribute visibility="private" xmi.id="93" value="" type="QPtrList&lt;Memofile>" name="_memofiles" />
</UML:Class> </UML:Class>
<UML:Class visibility="public" xmi.id="64" name="Memofile" > <UML:Class visibility="public" xmi.id="64" name="Memofile" >
<UML:Operation visibility="public" xmi.id="65" type="" 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="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>
<UML:Operation visibility="public" xmi.id="68" type="" name="Memofile" > <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="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="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="72" value="" type="uint" name="lastModifiedTime" />
<UML:Parameter visibility="public" xmi.id="73" value="" type="QString" name="filename" /> <UML:Parameter visibility="public" xmi.id="73" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
<UML:Parameter visibility="public" xmi.id="74" value="" type="QString" name="text" /> <UML:Parameter visibility="public" xmi.id="74" value="" type=TQSTRING_OBJECT_NAME_STRING name="text" />
</UML:Operation> </UML:Operation>
<UML:Operation visibility="public" xmi.id="75" type="uint" name="lastModified" /> <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="77" value="" type="uint" name="_lastModified" />
<UML:Attribute visibility="private" xmi.id="78" value="" type="QString" name="_categoryName" /> <UML:Attribute visibility="private" xmi.id="78" value="" type=TQSTRING_OBJECT_NAME_STRING name="_categoryName" />
<UML:Attribute visibility="private" xmi.id="79" value="" type="QString" name="_filename" /> <UML:Attribute visibility="private" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING name="_filename" />
</UML:Class> </UML:Class>
<UML:DataType stereotype="3" visibility="public" xmi.id="84" name="QMap" /> <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&lt;Memofile>" /> <UML:DataType stereotype="3" visibility="public" xmi.id="94" name="QPtrList&lt;Memofile>" />
<UML:Association visibility="public" xmi.id="36" > <UML:Association visibility="public" xmi.id="36" >
<UML:Association.connection> <UML:Association.connection>

@ -89,7 +89,7 @@ void Memofiles::load (bool loadAll)
// DEBUGKPILOT << fname // DEBUGKPILOT << fname
// << ": checking category: [" << categoryName // << ": checking category: [" << categoryName
// << "], file: [" << file << "]." << endl; // << "], file: [" << file << "]." << endl;
Memofile * memofile = find(categoryName, file); Memofile * memofile = tqfind(categoryName, file);
if (NULL == memofile) { if (NULL == memofile) {
memofile = new Memofile(category, categoryName, file, _baseDirectory); memofile = new Memofile(category, categoryName, file, _baseDirectory);
memofile->setModified(true); memofile->setModified(true);
@ -316,7 +316,7 @@ bool Memofiles::loadFromMetadata ()
return true; return true;
} }
Memofile * Memofiles::find (recordid_t id) Memofile * Memofiles::tqfind (recordid_t id)
{ {
Memofile * memofile; 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; Memofile * memofile;
@ -353,7 +353,7 @@ void Memofiles::deleteMemo(PilotMemo * memo)
if (! memo->isDeleted()) if (! memo->isDeleted())
return; return;
Memofile * memofile = find(memo->id()); Memofile * memofile = tqfind(memo->id());
if (memofile) { if (memofile) {
memofile->deleteFile(); memofile->deleteFile();
_memofiles.remove(memofile); _memofiles.remove(memofile);
@ -375,7 +375,7 @@ void Memofiles::addModifiedMemo (PilotMemo * memo)
+ TQString::number(memo->id()) + CSL1("], title: [") + TQString::number(memo->id()) + CSL1("], title: [")
+ memo->getTitle() + CSL1("]. "); + memo->getTitle() + CSL1("]. ");
Memofile * memofile = find(memo->id()); Memofile * memofile = tqfind(memo->id());
if (NULL == memofile) { if (NULL == memofile) {
_cudCounter.created(); _cudCounter.created();
@ -653,7 +653,7 @@ TQString Memofiles::filename(PilotMemo * memo)
if (filename.isEmpty()) { if (filename.isEmpty()) {
TQString text = memo->text(); TQString text = memo->text();
int i = text.find(CSL1("\n")); int i = text.tqfind(CSL1("\n"));
if (i > 1) { if (i > 1) {
filename = text.left(i); filename = text.left(i);
} }
@ -666,7 +666,7 @@ TQString Memofiles::filename(PilotMemo * memo)
TQString category = _categories[memo->category()]; 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 // 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 // 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. // for trouble.
while (NULL != memofile && uniq <=20) { while (NULL != memofile && uniq <=20) {
newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) ); newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) );
memofile = find(category, newfilename); memofile = tqfind(category, newfilename);
} }
return newfilename; return newfilename;

@ -55,8 +55,8 @@ public:
TQPtrList<Memofile> getModified(); TQPtrList<Memofile> getModified();
TQPtrList<Memofile> getAll() { return _memofiles; } ; TQPtrList<Memofile> getAll() { return _memofiles; } ;
Memofile * find (const TQString & category, const TQString & filename); Memofile * tqfind (const TQString & category, const TQString & filename);
Memofile * find (recordid_t id); Memofile * tqfind (recordid_t id);
MemoCategoryMap readCategoryMetadata(); MemoCategoryMap readCategoryMetadata();
void setCategories(MemoCategoryMap map) { _categories = map; } ; void setCategories(MemoCategoryMap map) { _categories = map; } ;

@ -3,7 +3,7 @@
<comment>A tabWidget for configuring <comment>A tabWidget for configuring
the Memofile-conduit settings.</comment> the Memofile-conduit settings.</comment>
<author>Jason 'vanRijn' Kasper</author> <author>Jason 'vanRijn' Kasper</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form1</cstring> <cstring>Form1</cstring>
</property> </property>
@ -46,7 +46,7 @@ the Memofile-conduit settings.</comment>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
@ -60,7 +60,7 @@ the Memofile-conduit settings.</comment>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="tqlayoutMargin" stdset="0">
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Widget2</cstring> <cstring>Widget2</cstring>
</property> </property>
@ -88,7 +88,7 @@ the Memofile-conduit settings.</comment>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel2</cstring> <cstring>textLabel2</cstring>
</property> </property>
@ -96,7 +96,7 @@ the Memofile-conduit settings.</comment>
<string>Sync private records:</string> <string>Sync private records:</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -115,7 +115,7 @@ the Memofile-conduit settings.</comment>
<string>Select the directory you want to store your PDA's memos in</string> <string>Select the directory you want to store your PDA's memos in</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="1"> <widget class="TQCheckBox" row="1" column="1">
<property name="name"> <property name="name">
<cstring>fSyncPrivate</cstring> <cstring>fSyncPrivate</cstring>
</property> </property>

@ -9,6 +9,6 @@ kde_module_LTLIBRARIES = conduit_notepad.la
conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \ conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \
notepad-conduit.cc notepad-factory.cc 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) conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO)

@ -76,7 +76,7 @@ NotepadConduit::~NotepadConduit()
TQDir dir(NotepadConduitSettings::outputDirectory()); TQDir dir(NotepadConduitSettings::outputDirectory());
if(!dir.exists() && !dir.mkdir(dir.path())) { 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(); delayDone();
return false; return false;
} }
@ -115,8 +115,8 @@ bool NotepadConduit::event(TQEvent *e)
// NotepadActionThread // NotepadActionThread
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
NotepadActionThread::NotepadActionThread(TQObject *parent, KPilotLink *link) : NotepadActionThread::NotepadActionThread(TQObject *tqparent, KPilotLink *link) :
fParent(parent), fLink(link), notSaved(0), saved(0) fParent(tqparent), fLink(link), notSaved(0), saved(0)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
} }
@ -251,7 +251,7 @@ void NotepadActionThread::saveImage(struct NotePad *n)
n->changeDate.min, n->changeDate.min,
n->changeDate.sec); 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 #ifdef DEBUG

@ -59,10 +59,10 @@ private:
/** /**
* This class saves the notepads to disk * This class saves the notepads to disk
*/ */
class NotepadActionThread : public QThread class NotepadActionThread : public TQThread
{ {
public: public:
NotepadActionThread(TQObject *parent, KPilotLink *link); NotepadActionThread(TQObject *tqparent, KPilotLink *link);
virtual void run(); virtual void run();
int getFailed() { return notSaved; } int getFailed() { return notSaved; }

@ -47,7 +47,7 @@
class NotepadConduitConfig : public ConduitConfigBase class NotepadConduitConfig : public ConduitConfigBase
{ {
public: public:
NotepadConduitConfig(TQWidget *parent=0L, const char *n=0L); NotepadConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();
static ConduitConfigBase *create(TQWidget *p, const char *n) static ConduitConfigBase *create(TQWidget *p, const char *n)

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>NotepadWidget</class> <class>NotepadWidget</class>
<author>Jörn Ahrens</author> <author>Jörn Ahrens</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form2</cstring> <cstring>Form2</cstring>
</property> </property>
@ -20,11 +20,11 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -57,7 +57,7 @@
<cstring>fOutputDirectory</cstring> <cstring>fOutputDirectory</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>

@ -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_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) conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
kde_kcfg_DATA = nullconduit.kcfg kde_kcfg_DATA = nullconduit.kcfg

@ -35,7 +35,7 @@
// Only include what we really need: // Only include what we really need:
// First UNIX system stuff, then std C++, // First UNIX system stuff, then std C++,
// then Qt, then KDE, then local includes. // then TQt, then KDE, then local includes.
// //
// //
#include <time.h> #include <time.h>

@ -47,7 +47,7 @@
class NullConduitConfig : public ConduitConfigBase class NullConduitConfig : public ConduitConfigBase
{ {
public: public:
NullConduitConfig(TQWidget *parent=0L, const char *n=0L); NullConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();
protected: protected:

@ -3,7 +3,7 @@
<comment>A tabWidget for configuring <comment>A tabWidget for configuring
the Null-conduit settings.</comment> the Null-conduit settings.</comment>
<author>Adriaan de Groot</author> <author>Adriaan de Groot</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form1</cstring> <cstring>Form1</cstring>
</property> </property>
@ -46,7 +46,7 @@ the Null-conduit settings.</comment>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
@ -60,7 +60,7 @@ the Null-conduit settings.</comment>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="tqlayoutMargin" stdset="0">
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Widget2</cstring> <cstring>Widget2</cstring>
</property> </property>
@ -77,7 +77,7 @@ the Null-conduit settings.</comment>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QLineEdit" row="0" column="1"> <widget class="TQLineEdit" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fLogMessage</cstring> <cstring>fLogMessage</cstring>
</property> </property>
@ -88,7 +88,7 @@ the Null-conduit settings.</comment>
<string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1_2</cstring> <cstring>TextLabel1_2</cstring>
</property> </property>

@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = conduit_popmail.la
conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \ conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
popmail-factory.cc setupDialog.cc \ popmail-factory.cc setupDialog.cc \
popmail-conduit.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) conduit_popmail_la_LIBADD = ../../lib/libkpilot.la $(LIB_KIO)
# this option you can leave out. Just, if you use "make dist", you need it # this option you can leave out. Just, if you use "make dist", you need it

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>PopMailWidget</class> <class>PopMailWidget</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>PopMailWidget</cstring> <cstring>PopMailWidget</cstring>
</property> </property>
@ -22,11 +22,11 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fTabWidget</cstring> <cstring>fTabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -54,7 +54,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_2</cstring> <cstring>textLabel1_2</cstring>
</property> </property>
@ -65,7 +65,7 @@
<string>&lt;qt&gt;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 &lt;i&gt;working&lt;/i&gt; method is through KMail.&lt;/qt&gt;</string> <string>&lt;qt&gt;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 &lt;i&gt;working&lt;/i&gt; method is through KMail.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -87,7 +87,7 @@
<string>&lt;qt&gt;Enter the email address you want to send messages as here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the email address you want to send messages as here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>textLabel2</cstring> <cstring>textLabel2</cstring>
</property> </property>
@ -95,7 +95,7 @@
<string>Signature file:</string> <string>Signature file:</string>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, 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.&lt;/qt&gt;</string> <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, 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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="KURLRequester" row="2" column="1"> <widget class="KURLRequester" row="2" column="1">
@ -103,10 +103,10 @@
<cstring>fSignature</cstring> <cstring>fSignature</cstring>
</property> </property>
<property name="whatsThis" stdset="0"> <property name="whatsThis" stdset="0">
<string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, 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.&lt;/qt&gt;</string> <string>&lt;qt&gt;If you want to add a signature file, enter the location of your signature file (usually, &lt;i&gt;.signature&lt;/i&gt;, 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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="0" column="1"> <widget class="TQComboBox" row="0" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Do Not Send Mail</string> <string>Do Not Send Mail</string>

@ -40,6 +40,7 @@ class PopMailWidget; // From setup-dialog.ui
class PopMailWidgetConfig : public ConduitConfigBase class PopMailWidgetConfig : public ConduitConfigBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
PopMailWidgetConfig(TQWidget *, const char *); PopMailWidgetConfig(TQWidget *, const char *);
virtual void load(); virtual void load();

@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = conduit_record.la
conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cc 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) conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
kde_kcfg_DATA = settings.kcfg kde_kcfg_DATA = settings.kcfg

@ -48,7 +48,7 @@
class ConduitConfig : public ConduitConfigBase class ConduitConfig : public ConduitConfigBase
{ {
public: public:
ConduitConfig(TQWidget *parent=0L, const char *n=0L); ConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();
protected: protected:

@ -3,7 +3,7 @@
<comment>A tabWidget for configuring <comment>A tabWidget for configuring
the Record-conduit settings.</comment> the Record-conduit settings.</comment>
<author>Adriaan de Groot</author> <author>Adriaan de Groot</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form1</cstring> <cstring>Form1</cstring>
</property> </property>
@ -46,7 +46,7 @@ the Record-conduit settings.</comment>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
@ -60,7 +60,7 @@ the Record-conduit settings.</comment>
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="tqlayoutMargin" stdset="0">
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Widget2</cstring> <cstring>Widget2</cstring>
</property> </property>
@ -77,7 +77,7 @@ the Record-conduit settings.</comment>
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QLineEdit" row="0" column="1"> <widget class="TQLineEdit" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fLogMessage</cstring> <cstring>fLogMessage</cstring>
</property> </property>
@ -88,7 +88,7 @@ the Record-conduit settings.</comment>
<string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the message to add to the Sync Log on your Pilot here.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1_2</cstring> <cstring>TextLabel1_2</cstring>
</property> </property>
@ -99,7 +99,7 @@ the Record-conduit settings.</comment>
<cstring>fLogMessage</cstring> <cstring>fLogMessage</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel2_2</cstring> <cstring>TextLabel2_2</cstring>
</property> </property>
@ -110,7 +110,7 @@ the Record-conduit settings.</comment>
<cstring>fDatabases</cstring> <cstring>fDatabases</cstring>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="1" column="1"> <widget class="TQLineEdit" row="1" column="1">
<property name="name"> <property name="name">
<cstring>fDatabases</cstring> <cstring>fDatabases</cstring>
</property> </property>
@ -135,7 +135,7 @@ the Record-conduit settings.</comment>
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="2" column="1"> <widget class="TQCheckBox" row="2" column="1">
<property name="name"> <property name="name">
<cstring>fFailImmediately</cstring> <cstring>fFailImmediately</cstring>
</property> </property>

@ -15,7 +15,7 @@ conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \
sysinfo-setup.cc \ sysinfo-setup.cc \
sysinfo-conduit.cc \ sysinfo-conduit.cc \
sysinfo-setup_dialog.ui 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) conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI) $(LIB_KIO)
kpilot_sysinfo_data_DATA = Template.html Template.txt kpilot_sysinfo_data_DATA = Template.html Template.txt

@ -147,7 +147,7 @@
<tbody> <tbody>
<tr><td><b>Operating System:</b></td><td>#os#</td></tr> <tr><td><b>Operating System:</b></td><td>#os#</td></tr>
<tr><td><b>Hostname:</b></td><td>#hostname#</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>KDE Libraries Version:</b></td><td>#kde#</td></tr>
<tr><td><b>KPilot Version:</b></td><td>#kpilot#</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> <tr><td><b>Pilot-Link Version:</b></td><td>#pilotlink#</td></tr>

@ -107,7 +107,7 @@ const TQString SysInfoConduit::defaultpage = CSL1("KPilot System Information Pag
"-) Version Information (Desktop)\n" "-) Version Information (Desktop)\n"
" Operating System: #os#\n" " Operating System: #os#\n"
" Hostname: #hostname#\n" " Hostname: #hostname#\n"
" Qt Version: #qt#\n" " TQt Version: #qt#\n"
" KDE Version: #kde#\n" " KDE Version: #kde#\n"
" KPilot Version: #kpilot#\n" " KPilot Version: #kpilot#\n"
" Pilot-Link Version: #pilotlink#\n" " Pilot-Link Version: #pilotlink#\n"
@ -299,10 +299,10 @@ void SysInfoConduit::storageInfo()
const KPilotCard *device = fHandle->getCardInfo(1); const KPilotCard *device = fHandle->getCardInfo(1);
if (device) { if (device) {
fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)") fValues[CSL1("cards")] = CSL1("%1 (%2, %3 kB of %3 kB free)")
.arg(TQString::tqfromLatin1(device->getCardName())) .tqarg(TQString::tqfromLatin1(device->getCardName()))
.arg(TQString::tqfromLatin1(device->getCardManufacturer())) .tqarg(TQString::tqfromLatin1(device->getCardManufacturer()))
.arg(device->getRamFree()/1024) .tqarg(device->getRamFree()/1024)
.arg(device->getRamSize()/1024); .tqarg(device->getRamSize()/1024);
KPILOT_DELETE(device); KPILOT_DELETE(device);
} else { } else {
fValues[CSL1("cards")] = i18n("No Cards available via pilot-link"); fValues[CSL1("cards")] = i18n("No Cards available via pilot-link");
@ -408,25 +408,25 @@ void SysInfoConduit::pcVersionInfo()
struct utsname name; struct utsname name;
if (uname (&name) >= 0) { if (uname (&name) >= 0) {
fValues[CSL1("os")] = CSL1("%1 %3, %5") fValues[CSL1("os")] = CSL1("%1 %3, %5")
.arg(TQString::tqfromLatin1(name.sysname)) .tqarg(TQString::tqfromLatin1(name.sysname))
.arg(TQString::tqfromLatin1(name.release)) .tqarg(TQString::tqfromLatin1(name.release))
.arg(TQString::tqfromLatin1(name.machine)); .tqarg(TQString::tqfromLatin1(name.machine));
fValues[CSL1("hostname")] = CSL1("%2").arg(TQString::tqfromLatin1(name.nodename)); fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(name.nodename));
} }
#ifdef KDE_VERSION_STRING #ifdef KDE_VERSION_STRING
fValues[CSL1("kde")] = TQString::tqfromLatin1(KDE_VERSION_STRING); fValues[CSL1("kde")] = TQString::tqfromLatin1(KDE_VERSION_STRING);
#endif #endif
#ifdef QT_VERSION_STR #ifdef TQT_VERSION_STR
fValues[CSL1("qt")] = TQString::tqfromLatin1(QT_VERSION_STR); fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR);
#endif #endif
fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4") fValues[CSL1("pilotlink")] = CSL1("%1.%2.%3%4")
.arg(PILOT_LINK_VERSION) .tqarg(PILOT_LINK_VERSION)
.arg(PILOT_LINK_MAJOR) .tqarg(PILOT_LINK_MAJOR)
.arg(PILOT_LINK_MINOR) .tqarg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH #ifdef PILOT_LINK_PATCH
.arg(TQString::tqfromLatin1(PILOT_LINK_PATCH)); .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH));
#else #else
.arg(TQString()); .tqarg(TQString());
#endif #endif
keepParts.append(CSL1("pcversion")); keepParts.append(CSL1("pcversion"));
} else removeParts.append(CSL1("pcversion")); } else removeParts.append(CSL1("pcversion"));
@ -441,12 +441,12 @@ void SysInfoConduit::palmVersionInfo()
* - #palmos# * - #palmos#
*/ */
/* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)") /* fValues["palmos"] = TQString("PalmOS %1.%2 (compat %3.%4)")
.arg(fHandle->getSysInfo()->getMajorVersion()) .tqarg(fHandle->getSysInfo()->getMajorVersion())
.arg(fHandle->getSysInfo()->getMinorVersion()) .tqarg(fHandle->getSysInfo()->getMinorVersion())
.arg(fHandle->getSysInfo()->getCompatMajorVersion()) .tqarg(fHandle->getSysInfo()->getCompatMajorVersion())
.arg(fHandle->getSysInfo()->getCompatMinorVersion());*/ .tqarg(fHandle->getSysInfo()->getCompatMinorVersion());*/
KPilotSysInfo i = deviceLink()->getSysInfo(); 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")); keepParts.append(CSL1("palmversion"));
} else removeParts.append(CSL1("palmversion")); } else removeParts.append(CSL1("palmversion"));
@ -513,12 +513,12 @@ void SysInfoConduit::writeFile()
// Remove all parts not extracted // Remove all parts not extracted
for ( TQStringList::Iterator it = removeParts.begin(); it != removeParts.end(); ++it ) { 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); re.setMinimal(true);
output.remove(re); output.remove(re);
} }
for ( TQStringList::Iterator it = keepParts.begin(); it != keepParts.end(); ++it ) { 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); re.setMinimal(true);
output.tqreplace(re, CSL1("\\1")); output.tqreplace(re, CSL1("\\1"));
} }
@ -526,7 +526,7 @@ void SysInfoConduit::writeFile()
// Do a loop through all keys in fValues // Do a loop through all keys in fValues
TQMap<TQString,TQString>::Iterator it; TQMap<TQString,TQString>::Iterator it;
for ( it = fValues.begin(); it != fValues.end(); ++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 // Insert the list of databases
@ -571,7 +571,7 @@ void SysInfoConduit::writeFile()
dbstring.append(newpatt); 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); output.tqreplace(re.cap(0), dbstring);
} }
@ -584,11 +584,11 @@ void SysInfoConduit::writeFile()
TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() ); TQFileInfo fi(TQDir::home(), CSL1("KPilotSysInfo.")+TQFileInfo(templatefile).extension() );
fOutputFile=fi.absFilePath(); fOutputFile=fi.absFilePath();
WARNINGKPILOT << "Unable to open output file, using " << fOutputFile << " instead." << endl; 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); outfile.setName(fOutputFile);
if (!outfile.open(IO_WriteOnly)) { if (!outfile.open(IO_WriteOnly)) {
WARNINGKPILOT<< "Unable to open " << fOutputFile << endl; 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())); TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
return; return;
} }
@ -599,7 +599,7 @@ void SysInfoConduit::writeFile()
outstream<<output; outstream<<output;
outfile.close(); 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())); TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
} }

@ -33,6 +33,7 @@
class SysInfoConduit : public ConduitAction class SysInfoConduit : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
SysInfoConduit( SysInfoConduit(
KPilotLink *o, KPilotLink *o,

@ -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. ** several text fields with special meanings.
** 0: The text displayed in the list. ** 0: The text displayed in the list.
** 1: The index of the item in the sysinfoEntries array. ** 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". ** This is a convenience define to update an item's "original setting".
*/ */
#define updateSetting(i) { TQCheckListItem *ubbu=(i); \ #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) : SysInfoWidgetConfig::SysInfoWidgetConfig(TQWidget *w, const char *n) :

@ -36,7 +36,7 @@ class SysInfoWidget;
class SysInfoWidgetConfig : public ConduitConfigBase class SysInfoWidgetConfig : public ConduitConfigBase
{ {
public: public:
SysInfoWidgetConfig(TQWidget *parent, const char *); SysInfoWidgetConfig(TQWidget *tqparent, const char *);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();
virtual bool isModified() const; virtual bool isModified() const;

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>SysInfoWidget</class> <class>SysInfoWidget</class>
<author>Reinhold Kainhofer</author> <author>Reinhold Kainhofer</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form2</cstring> <cstring>Form2</cstring>
</property> </property>
@ -23,11 +23,11 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -63,7 +63,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel4</cstring> <cstring>textLabel4</cstring>
</property> </property>
@ -77,7 +77,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fOutputType</cstring> <cstring>fOutputType</cstring>
</property> </property>
@ -88,7 +88,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </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"> <property name="name">
<cstring>radioButton3</cstring> <cstring>radioButton3</cstring>
</property> </property>
@ -102,7 +102,7 @@
<string>&lt;qt&gt;Select this option to output the system information data as a HTML document.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select this option to output the system information data as a HTML document.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>radioButton4</cstring> <cstring>radioButton4</cstring>
</property> </property>
@ -124,7 +124,7 @@
<string>&lt;qt&gt;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.&lt;/qt&gt;</string> <string>&lt;qt&gt;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.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="2" column="0"> <widget class="TQRadioButton" row="2" column="0">
<property name="name"> <property name="name">
<cstring>radioButton5</cstring> <cstring>radioButton5</cstring>
</property> </property>
@ -139,7 +139,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -167,7 +167,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QListView" row="0" column="0"> <widget class="TQListView" row="0" column="0">
<column> <column>
<property name="text"> <property name="text">
<string>Output Type</string> <string>Output Type</string>

@ -16,7 +16,7 @@ conduit_time_la_SOURCES = timeConduitSettings.kcfgc \
time-setup.cc \ time-setup.cc \
time-conduit.cc \ time-conduit.cc \
time-setup_dialog.ui 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) conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_KDEUI)
kde_kcfg_DATA = timeconduit.kcfg kde_kcfg_DATA = timeconduit.kcfg

@ -37,8 +37,9 @@ class KAboutData;
class TimeWidgetConfig : public ConduitConfigBase class TimeWidgetConfig : public ConduitConfigBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
TimeWidgetConfig(TQWidget *parent, const char *); TimeWidgetConfig(TQWidget *tqparent, const char *);
virtual void commit(); virtual void commit();
virtual void load(); virtual void load();
static ConduitConfigBase *create(TQWidget *,const char *); static ConduitConfigBase *create(TQWidget *,const char *);

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>TimeWidget</class> <class>TimeWidget</class>
<author>Reinhold Kainhofer</author> <author>Reinhold Kainhofer</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form2</cstring> <cstring>Form2</cstring>
</property> </property>
@ -23,11 +23,11 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -55,7 +55,7 @@
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
</spacer> </spacer>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>directionGroup</cstring> <cstring>directionGroup</cstring>
</property> </property>
@ -72,7 +72,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
@ -86,7 +86,7 @@
<string>&lt;qt&gt;Select this option to synchronize the handheld time with the PC time, by using the PC time on both.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select this option to synchronize the handheld time with the PC time, by using the PC time on both.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>RadioButton1_2</cstring> <cstring>RadioButton1_2</cstring>
</property> </property>
@ -102,7 +102,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>

@ -24,17 +24,15 @@ libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \ conduit_vcal_la_SOURCES = vcal-conduit.cc vcalRecord.cc \
vcal-factory.cc vcal-setup.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 \ conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
../../../libkcal/libkcal.la \
libvcalconduit_shared.la libvcalconduit_shared.la
conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \ conduit_todo_la_SOURCES = todo-conduit.cc todoRecord.cc \
todo-factory.cc todo-setup.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 \ conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
../../../libkcal/libkcal.la \
libvcalconduit_shared.la libvcalconduit_shared.la
conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h

@ -91,7 +91,7 @@ void CleanUpState::startSync( ConduitAction *ca )
vccb->addLogError( i18n( "An error occurred while uploading" vccb->addLogError( i18n( "An error occurred while uploading"
" \"%1\". You can try to upload " " \"%1\". You can try to upload "
"the temporary local file \"%2\" manually.") "the temporary local file \"%2\" manually.")
.arg(vccb->config()->calendarFile()).arg(fCalendarFile)); .tqarg(vccb->config()->calendarFile()).tqarg(fCalendarFile));
} }
else { else {
KIO::NetAccess::removeTempFile( fCalendarFile ); KIO::NetAccess::removeTempFile( fCalendarFile );

@ -123,7 +123,7 @@ void HHToPCState::handleRecord( ConduitAction *ca )
{ {
KCal::Incidence *e = vccb->addRecord( r ); KCal::Incidence *e = vccb->addRecord( r );
if ( vccb->config()->syncArchived() && archiveRecord ) { 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); KCal::Incidence*e=addRecord(r);
if (config()->syncArchived() && archiveRecord) { if (config()->syncArchived() && archiveRecord) {
e->setSyncStatus(KCal::Incidence::SYNCDEL); e->setSynctqStatus(KCal::Incidence::SYNCDEL);
} }
} }
} }

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>VCalWidget</class> <class>VCalWidget</class>
<author>Adriaan de Groot</author> <author>Adriaan de Groot</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Form1</cstring> <cstring>Form1</cstring>
</property> </property>
@ -44,7 +44,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QTabWidget" row="0" column="0"> <widget class="TQTabWidget" row="0" column="0">
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
@ -58,7 +58,7 @@
</property> </property>
<property name="tqlayoutMargin" stdset="0"> <property name="tqlayoutMargin" stdset="0">
</property> </property>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>Widget2</cstring> <cstring>Widget2</cstring>
</property> </property>
@ -86,7 +86,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QButtonGroup" row="0" column="0"> <widget class="TQButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fSyncDestination</cstring> <cstring>fSyncDestination</cstring>
</property> </property>
@ -97,7 +97,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </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"> <property name="name">
<cstring>fSyncStdCalendar</cstring> <cstring>fSyncStdCalendar</cstring>
</property> </property>
@ -108,7 +108,7 @@
<string>&lt;qt&gt;Select this option to synchronize with the calendar specified by the KDE calendar settings.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select this option to synchronize with the calendar specified by the KDE calendar settings.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fSyncFile</cstring> <cstring>fSyncFile</cstring>
</property> </property>
@ -143,7 +143,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fArchive</cstring> <cstring>fArchive</cstring>
</property> </property>
@ -157,7 +157,7 @@ be saved in the calendar on the PC.</string>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>tab</cstring> <cstring>tab</cstring>
</property> </property>
@ -168,7 +168,7 @@ be saved in the calendar on the PC.</string>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fTextLabel</cstring> <cstring>fTextLabel</cstring>
</property> </property>
@ -187,7 +187,7 @@ be saved in the calendar on the PC.</string>
<cstring>fConflictResolution</cstring> <cstring>fConflictResolution</cstring>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="0" column="1"> <widget class="TQComboBox" row="0" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Use KPilot's Global Setting</string> <string>Use KPilot's Global Setting</string>

@ -120,7 +120,7 @@ void PCToHHState::handleRecord( ConduitAction *ca )
if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) ) if( id > 0 && ( s = vccb->database()->readRecordById( id ) ) )
{ {
if( e->syncStatus() == KCal::Incidence::SYNCDEL ) if( e->synctqStatus() == KCal::Incidence::SYNCDEL )
{ {
vccb->deletePalmRecord( e, s ); vccb->deletePalmRecord( e, s );
} }

@ -38,7 +38,7 @@
#include "teststate.h" #include "teststate.h"
#include "vcal-conduitbase.h" #include "vcal-conduitbase.h"
TestState::TestState() : fCalendar( TQString::null ) TestState::TestState() : fCalendar( TQString() )
{ {
fState = eTest; fState = eTest;
} }

@ -154,13 +154,13 @@ KCal::Incidence *TodoConduitPrivate::getNextModifiedIncidence()
} }
if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator; if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
while (fAllTodosIterator != fAllTodos.end() && 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; e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
#ifdef DEBUG #ifdef DEBUG
if(e) if(e)
DEBUGKPILOT<< e->summary()<<" had SyncStatus="<<e->syncStatus()<<endl; DEBUGKPILOT<< e->summary()<<" had SynctqStatus="<<e->synctqStatus()<<endl;
#endif #endif
} }
@ -230,7 +230,7 @@ const TQString TodoConduit::getTitle(PilotRecordBase *de)
{ {
return TQString(d->getDescription()); return TQString(d->getDescription());
} }
return TQString::null; return TQString();
} }

@ -64,6 +64,7 @@ public:
class TodoConduit : public VCalConduitBase class TodoConduit : public VCalConduitBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
TodoConduit(KPilotLink *, TodoConduit(KPilotLink *,
const char *name=0L, const char *name=0L,

@ -134,8 +134,8 @@ bool KCalSync::setTodo(KCal::Todo *e,
// NOTE: This MUST be done last, since every other set* call // NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an // calls updated(), which will trigger an
// setSyncStatus(SYNCMOD)!!! // setSynctqStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE); e->setSynctqStatus(KCal::Incidence::SYNCNONE);
return true; return true;
} }

@ -155,7 +155,7 @@ KCal::Incidence *VCalConduitPrivate::getNextModifiedIncidence()
if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator; if ( fAllEventsIterator != fAllEvents.end() ) e = *fAllEventsIterator;
// Then walk the list until we find an unsynced entry // Then walk the list until we find an unsynced entry
while ( fAllEventsIterator != fAllEvents.end() && 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; e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;
} }
@ -200,7 +200,7 @@ const TQString VCalConduit::getTitle(PilotRecordBase *de)
{ {
PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de); PilotDateEntry*d=dynamic_cast<PilotDateEntry*>(de);
if (d) return TQString(d->getDescription()); 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) ) (e->recurrenceType() == KCal::Recurrence::rYearlyPos) )
{ {
// Warn ahead of time // 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); PilotDateEntry *dateEntry = dynamic_cast<PilotDateEntry*>(de);

@ -67,6 +67,7 @@ public:
class VCalConduit : public VCalConduitBase class VCalConduit : public VCalConduitBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
VCalConduit(KPilotLink *, VCalConduit(KPilotLink *,
const char *name=0L, const char *name=0L,

@ -288,8 +288,8 @@ static void listResources( KCal::CalendarResources *p )
<< fCalendar->isLocalTime() << endl; << fCalendar->isLocalTime() << endl;
emit logMessage( fCalendar->isLocalTime() ? emit logMessage( fCalendar->isLocalTime() ?
i18n( "Using local time zone: %1" ).arg( tz ) : i18n( "Using local time zone: %1" ).tqarg( tz ) :
i18n( "Using non-local time zone: %1" ).arg( tz ) ); i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
KURL kurl( config()->calendarFile() ); KURL kurl( config()->calendarFile() );
if( !KIO::NetAccess::download( 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 " emit logError(i18n( "You chose to sync with the file \"%1\", which "
"cannot be opened. Please make sure to supply a " "cannot be opened. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. " "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 ); KIO::NetAccess::removeTempFile( fCalendarFile );
return false; return false;
} }
@ -321,14 +321,14 @@ static void listResources( KCal::CalendarResources *p )
emit logError( i18n( "You chose to sync with the file \"%1\", which " emit logError( i18n( "You chose to sync with the file \"%1\", which "
"cannot be opened or created. Please make sure to supply a " "cannot be opened or created. Please make sure to supply a "
"valid file name in the conduit's configuration dialog. " "valid file name in the conduit's configuration dialog. "
"Aborting the conduit." ).arg( config()->calendarFile() ) ); "Aborting the conduit." ).tqarg( config()->calendarFile() ) );
return false; return false;
} }
fl.close(); fl.close();
setFirstSync( true ); setFirstSync( true );
} }
addSyncLogEntry( i18n( "Syncing with file \"%1\"" ) addSyncLogEntry( i18n( "Syncing with file \"%1\"" )
.arg( config()->calendarFile() ) ); .tqarg( config()->calendarFile() ) );
break; break;
} }
@ -353,8 +353,8 @@ static void listResources( KCal::CalendarResources *p )
#endif #endif
addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) ); addSyncLogEntry( i18n( "Syncing with standard calendar resource." ) );
emit logMessage( fCalendar->isLocalTime() ? emit logMessage( fCalendar->isLocalTime() ?
i18n( "Using local time zone: %1" ).arg( tz ) : i18n( "Using local time zone: %1" ).tqarg( tz ) :
i18n( "Using non-local time zone: %1" ).arg( tz ) ); i18n( "Using non-local time zone: %1" ).tqarg( tz ) );
break; break;
default: default:
break; break;
@ -433,7 +433,7 @@ int VCalConduitBase::resolveConflict( KCal::Incidence *e, PilotRecordBase *de )
return KMessageBox::No == questionYesNo( return KMessageBox::No == questionYesNo(
query, query,
i18n( "Conflicting Entries" ), i18n( "Conflicting Entries" ),
TQString::null, TQString(),
0 /* Never timeout */, 0 /* Never timeout */,
i18n( "Handheld" ), i18n( "PC" )); i18n( "Handheld" ), i18n( "PC" ));
} }
@ -452,7 +452,7 @@ KCal::Incidence*VCalConduitBase::changeRecord(PilotRecord *r,PilotRecord *)
if ( e && de ) if ( e && de )
{ {
// TODO: check for conflict, and if there is one, ask for resolution // 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() ) && r->isModified() )
{ {
// TODO: I have not yet found a way to complete ignore an item // 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 // NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an // calls updated(), which will trigger an
// setSyncStatus(SYNCMOD)!!! // setSynctqStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE); e->setSynctqStatus(KCal::Incidence::SYNCNONE);
fLocalDatabase->writeRecord( r ); fLocalDatabase->writeRecord( r );
} }
else else
@ -552,7 +552,7 @@ void VCalConduitBase::updateIncidenceOnPalm( KCal::Incidence *e,
return; return;
} }
if ( e->syncStatus() == KCal::Incidence::SYNCDEL ) if ( e->synctqStatus() == KCal::Incidence::SYNCDEL )
{ {
DEBUGKPILOT << fname << ": don't write deleted incidence " DEBUGKPILOT << fname << ": don't write deleted incidence "
<< e->summary() << " to the palm" << endl; << 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 // NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an // calls updated(), which will trigger an
// setSyncStatus(SYNCMOD)!!! // setSynctqStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE); e->setSynctqStatus(KCal::Incidence::SYNCNONE);
KPILOT_DELETE( r ); KPILOT_DELETE( r );
} }
} }
const TQString VCalConduitBase::dbname() const TQString VCalConduitBase::dbname()
{ {
return TQString::null; return TQString();
} }
PilotRecord *VCalConduitBase::readRecordByIndex( int index ) PilotRecord *VCalConduitBase::readRecordByIndex( int index )

@ -75,6 +75,7 @@ public:
class VCalConduitBase : public ConduitAction class VCalConduitBase : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
VCalConduitBase(KPilotLink *, VCalConduitBase(KPilotLink *,
const char *name = 0L, const char *name = 0L,

@ -512,8 +512,8 @@ bool KCalSync::setEvent(KCal::Event *e,
// NOTE: This MUST be done last, since every other set* call // NOTE: This MUST be done last, since every other set* call
// calls updated(), which will trigger an // calls updated(), which will trigger an
// setSyncStatus(SYNCMOD)!!! // setSynctqStatus(SYNCMOD)!!!
e->setSyncStatus(KCal::Incidence::SYNCNONE); e->setSynctqStatus(KCal::Incidence::SYNCNONE);
return true; return true;
} }

@ -155,6 +155,8 @@ dnl
dnl dnl
CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE" CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
if test "$HAVE_PISOCK" = "1" ; then if test "$HAVE_PISOCK" = "1" ; then
LDFLAGS_save="$LDFLAGS"
LDFLAGS="$LDFLAGS -ltqt"
AC_MSG_CHECKING([pilot-link version]) AC_MSG_CHECKING([pilot-link version])
AC_TRY_RUN([ AC_TRY_RUN([
#include <pi-version.h> #include <pi-version.h>
@ -173,6 +175,7 @@ if test "$HAVE_PISOCK" = "1" ; then
[AC_MSG_RESULT([Cross-compiling KPilot is doomed]) [AC_MSG_RESULT([Cross-compiling KPilot is doomed])
HAVE_PISOCK="0" HAVE_PISOCK="0"
]) ])
LDFLAGS="$LDFLAGS_save"
fi fi
if test "x$with_pilot_link" = "xCHECK" ; then if test "x$with_pilot_link" = "xCHECK" ; then
@ -180,6 +183,8 @@ if test "x$with_pilot_link" = "xCHECK" ; then
# Fairly random collection of possible extra libraries needed # Fairly random collection of possible extra libraries needed
# to link pilot-link against. # to link pilot-link against.
if test "$HAVE_PISOCK" = "1" ; then if test "$HAVE_PISOCK" = "1" ; then
LDFLAGS_save="$LDFLAGS"
LDFLAGS="$LDFLAGS -ltqt"
HAVE_PISOCK=0 HAVE_PISOCK=0
AC_CHECK_LIB(pisock, AC_CHECK_LIB(pisock,
@ -217,6 +222,7 @@ if test "$HAVE_PISOCK" = "1" ; then
) )
] ]
) )
LDFLAGS="$LDFLAGS_save"
fi fi
fi fi

@ -32,13 +32,13 @@
#include "options.h" #include "options.h"
#endif #endif
#ifndef QLINEEDIT_H #ifndef TQLINEEDIT_H
#include <tqlineedit.h> #include <tqlineedit.h>
#endif #endif
#ifndef QLAYOUT_H #ifndef TQLAYOUT_H
#include <tqlayout.h> #include <tqlayout.h>
#endif #endif
#ifndef QLABEL_H #ifndef TQLABEL_H
#include <tqlabel.h> #include <tqlabel.h>
#endif #endif
#ifndef _KDEBUG_H #ifndef _KDEBUG_H
@ -54,12 +54,12 @@
AddressEditor::AddressEditor(PilotAddress * p, AddressEditor::AddressEditor(PilotAddress * p,
PilotAddressInfo *appInfo, PilotAddressInfo *appInfo,
TQWidget * parent, TQWidget * tqparent,
const char *name) : const char *name) :
KDialogBase(KDialogBase::Plain, KDialogBase(KDialogBase::Plain,
i18n("Address Editor"), i18n("Address Editor"),
Ok | Cancel, Cancel, Ok | Cancel, Cancel,
parent, name, false /* non-modal */ ), tqparent, name, false /* non-modal */ ),
fDeleteOnCancel(p == 0L), fDeleteOnCancel(p == 0L),
fAddress(p), fAddress(p),
fAppInfo(appInfo) fAppInfo(appInfo)
@ -69,7 +69,7 @@ AddressEditor::AddressEditor(PilotAddress * p,
initLayout(); initLayout();
fillFields(); fillFields();
connect(parent, TQT_SIGNAL(recordChanged(PilotAddress *)), connect(tqparent, TQT_SIGNAL(recordChanged(PilotAddress *)),
this, TQT_SLOT(updateRecord(PilotAddress *))); this, TQT_SLOT(updateRecord(PilotAddress *)));
} }

@ -39,12 +39,13 @@ class TQLineEdit;
class AddressEditor : public KDialogBase class AddressEditor : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
AddressEditor(PilotAddress *address, AddressEditor(PilotAddress *address,
PilotAddressInfo *appInfo, PilotAddressInfo *appInfo,
TQWidget *parent, const char *name=0L); TQWidget *tqparent, const char *name=0L);
~AddressEditor(); ~AddressEditor();

@ -65,9 +65,9 @@
#include "addressWidget.moc" #include "addressWidget.moc"
AddressWidget::AddressWidget(TQWidget * parent, AddressWidget::AddressWidget(TQWidget * tqparent,
const TQString & path) : const TQString & path) :
PilotComponent(parent, "component_address", path), PilotComponent(tqparent, "component_address", path),
fAddrInfo(0L), fAddrInfo(0L),
fAddressAppInfo(0L), fAddressAppInfo(0L),
fPendingAddresses(0) fPendingAddresses(0)
@ -185,7 +185,7 @@ void AddressWidget::hideComponent()
#if KDE_VERSION<220 #if KDE_VERSION<220
s = i18n("There are still %1 address editing windows open.") s = i18n("There are still %1 address editing windows open.")
.arg(TQString::number(fPendingAddresses)); .tqarg(TQString::number(fPendingAddresses));
#else #else
s = i18n("There is still an address editing window open.", s = i18n("There is still an address editing window open.",
"There are still %n address editing windows open.", "There are still %n address editing windows open.",
@ -606,7 +606,7 @@ void AddressWidget::slotShowAddress(int which)
#endif #endif
TQString text(CSL1("<qt>")); TQString text(CSL1("<qt>"));
text += addr->getTextRepresentation(fAddressAppInfo,Qt::RichText); text += addr->getTextRepresentation(fAddressAppInfo,TQt::RichText);
text += CSL1("</qt>\n"); text += CSL1("</qt>\n");
fAddrInfo->setText(text); fAddrInfo->setText(text);
@ -675,11 +675,11 @@ void AddressWidget::slotExport()
TQString prompt = (currentCatID==-1) ? TQString prompt = (currentCatID==-1) ?
i18n("Export All Addresses") : i18n("Export All Addresses") :
i18n("Export Address Category %1").arg(fAddressAppInfo->categoryName(currentCatID)) ; i18n("Export Address Category %1").tqarg(fAddressAppInfo->categoryName(currentCatID)) ;
TQString saveFile = KFileDialog::getSaveFileName( TQString saveFile = KFileDialog::getSaveFileName(
TQString::null, TQString(),
CSL1("*.csv|Comma Separated Values"), CSL1("*.csv|Comma Separated Values"),
this, this,
prompt prompt
@ -693,7 +693,7 @@ void AddressWidget::slotExport()
} }
if (TQFile::exists(saveFile) && if (TQFile::exists(saveFile) &&
KMessageBox::warningContinueCancel(this, KMessageBox::warningContinueCancel(this,
i18n("The file <i>%1</i> exists. Overwrite?").arg(saveFile), i18n("The file <i>%1</i> exists. Overwrite?").tqarg(saveFile),
i18n("Overwrite File?"), i18n("Overwrite File?"),
i18n("Overwrite"))!=KMessageBox::Continue) i18n("Overwrite"))!=KMessageBox::Continue)
{ {
@ -707,7 +707,7 @@ void AddressWidget::slotExport()
if (!f) if (!f)
{ {
KMessageBox::sorry(this, KMessageBox::sorry(this,
i18n("The file <i>%1</i> could not be opened for writing.").arg(saveFile)); i18n("The file <i>%1</i> could not be opened for writing.").tqarg(saveFile));
return; return;
} }
fAddressList.first(); fAddressList.first();

@ -44,9 +44,10 @@ class PilotDatabase;
class AddressWidget : public PilotComponent class AddressWidget : public PilotComponent
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
AddressWidget(TQWidget* parent,const TQString& dbpath); AddressWidget(TQWidget* tqparent,const TQString& dbpath);
~AddressWidget(); ~AddressWidget();
// Pilot Component Methods: // Pilot Component Methods:
@ -117,7 +118,7 @@ private:
* currently selected category. * currently selected category.
* *
* The entire address database is read into memory in the * The entire address database is read into memory in the
* QList fAddressList. We need the appinfo block from the * TQList fAddressList. We need the appinfo block from the
* database to determine which categories there are; this * database to determine which categories there are; this
* is held in fAddressAppInfo. * is held in fAddressAppInfo.
* *
@ -128,7 +129,7 @@ private:
PilotAddressInfo *fAddressAppInfo; PilotAddressInfo *fAddressAppInfo;
TQPtrList<PilotAddress> fAddressList; TQPtrList<PilotAddress> fAddressList;
TQListBox *fListBox; TQListBox *fListBox;
QPushButton *fEditButton,*fDeleteButton; TQPushButton *fEditButton,*fDeleteButton;
protected: protected:
/** /**

@ -72,24 +72,24 @@
extern "C" extern "C"
{ {
KDE_EXPORT KCModule *create_kpilotconfig( TQWidget *parent, const char * ) KDE_EXPORT KCModule *create_kpilotconfig( TQWidget *tqparent, const char * )
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
return new ConduitConfigWidget( parent, "kcmkpilotconfig" ); return new ConduitConfigWidget( tqparent, "kcmkpilotconfig" );
} }
KDE_EXPORT ConfigWizard *create_wizard(TQWidget *parent, int m) KDE_EXPORT ConfigWizard *create_wizard(TQWidget *tqparent, int m)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
return new ConfigWizard(parent,"Wizard", m); return new ConfigWizard(tqparent,"Wizard", m);
} }
} }
class ConduitTip : public QToolTip class ConduitTip : public TQToolTip
{ {
public: public:
ConduitTip(TQListView *parent); ConduitTip(TQListView *tqparent);
virtual ~ConduitTip(); virtual ~ConduitTip();
protected: protected:
@ -133,7 +133,7 @@ ConduitTip::~ConduitTip()
TQString s = l->text(CONDUIT_COMMENT); TQString s = l->text(CONDUIT_COMMENT);
if (s.isEmpty()) return; if (s.isEmpty()) return;
if (s.find(CSL1("<qt>"),0,false) == -1) if (s.tqfind(CSL1("<qt>"),0,false) == -1)
{ {
s.prepend(CSL1("<qt>")); s.prepend(CSL1("<qt>"));
s.append(CSL1("</qt>")); s.append(CSL1("</qt>"));
@ -145,10 +145,10 @@ ConduitTip::~ConduitTip()
// implement our own check list items so we can detect if a given item was checked/unchecked. We need // implement our own check list items so we can detect if a given item was checked/unchecked. We need
// this to prevent the modified signal if one only wants to display a conduit's config widget. Currently, // this to prevent the modified signal if one only wants to display a conduit's config widget. Currently,
// KListView doesn't provide any signal that indicates that the checked state of a checklist item was changed. // KListView doesn't provide any signal that indicates that the checked state of a checklist item was changed.
class KPilotCheckListItem : public QCheckListItem class KPilotCheckListItem : public TQCheckListItem
{ {
public: public:
KPilotCheckListItem ( TQListViewItem * parent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem(parent, text, tt),mOriginalState(false) {} KPilotCheckListItem ( TQListViewItem * tqparent, const TQString & text, Type tt = RadioButtonController ) : TQCheckListItem(tqparent, text, tt),mOriginalState(false) {}
~KPilotCheckListItem() {} ~KPilotCheckListItem() {}
void setOriginalState(bool state) { mOriginalState=state; setOn(state);} void setOriginalState(bool state) { mOriginalState=state; setOn(state);}
@ -171,20 +171,20 @@ protected:
/* /*
** Create a page in the widget stack @p parent on page @p pageno, ** Create a page in the widget stack @p tqparent on page @p pageno,
** bearing the given @p text. The remainder of the parameters are ** bearing the given @p text. The remainder of the parameters are
** for esoteric things like: ** for esoteric things like:
** @p buttons set to non-null to include (and return) a TQHBox suitable ** @p buttons set to non-null to include (and return) a TQHBox suitable
** for displaying a row of buttons in on the page. ** for displaying a row of buttons in on the page.
** @p label set to non-null to return the TQLabel used to display @p text. ** @p label set to non-null to return the TQLabel used to display @p text.
*/ */
static void addDescriptionPage(TQWidgetStack *parent, static void addDescriptionPage(TQWidgetStack *tqparent,
int pageno, int pageno,
const TQString &text, const TQString &text,
TQHBox **buttons = 0L, TQHBox **buttons = 0L,
TQLabel **label = 0L) TQLabel **label = 0L)
{ {
TQVBox *v = new TQVBox(parent); TQVBox *v = new TQVBox(tqparent);
TQLabel *l = 0L; TQLabel *l = 0L;
v->setFrameShape(TQLabel::NoFrame); v->setFrameShape(TQLabel::NoFrame);
@ -192,7 +192,7 @@ static void addDescriptionPage(TQWidgetStack *parent,
l = new TQLabel(v); l = new TQLabel(v);
l->setText(text); l->setText(text);
l->tqsetAlignment(Qt::AlignLeft | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak); l->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak);
if (label) { *label = l; } if (label) { *label = l; }
@ -202,12 +202,12 @@ static void addDescriptionPage(TQWidgetStack *parent,
l = new TQLabel(v); l = new TQLabel(v);
} }
parent->addWidget(v,pageno); tqparent->addWidget(v,pageno);
} }
ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n) : ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *tqparent, const char *n) :
KCModule(parent, n), KCModule(tqparent, n),
fConduitList(0L), fConduitList(0L),
fStack(0L), fStack(0L),
fConfigureButton(0L), fConfigureButton(0L),
@ -225,7 +225,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
// Create the left hand column // Create the left hand column
fConduitList = new TQListView(this ,"ConduitList"); fConduitList = new TQListView(this ,"ConduitList");
fConduitList->addColumn(TQString::null); fConduitList->addColumn(TQString());
fConduitList->header()->hide(); fConduitList->header()->hide();
fConduitList->tqsetSizePolicy( fConduitList->tqsetSizePolicy(
TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred));
@ -267,7 +267,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
// Page 3 // Page 3
addDescriptionPage(fStack,INTERNAL_CONDUIT, addDescriptionPage(fStack,INTERNAL_CONDUIT,
TQString::null,0L,&fActionDescription); TQString(),0L,&fActionDescription);
// Page 5 - explanation about conduits // Page 5 - explanation about conduits
addDescriptionPage(fStack,CONDUIT_EXPLN, addDescriptionPage(fStack,CONDUIT_EXPLN,
@ -280,7 +280,7 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
// Page 6 - explanation about general setup // Page 6 - explanation about general setup
addDescriptionPage(fStack,GENERAL_EXPLN, addDescriptionPage(fStack,GENERAL_EXPLN,
i18n("<qt><p>The <i>general</i> portion of KPilot's setup " i18n("<qt><p>The <i>general</i> portion of KPilot's setup "
"tqcontains settings for your hardware and the way KPilot " "contains settings for your hardware and the way KPilot "
"should display your data. For the basic setup, which should fulfill " "should display your data. For the basic setup, which should fulfill "
"the need of most users, just use the setup wizard below.</p>" "the need of most users, just use the setup wizard below.</p>"
"If you need some special settings, this dialog provides all the options " "If you need some special settings, this dialog provides all the options "
@ -300,9 +300,9 @@ ConduitConfigWidgetBase::ConduitConfigWidgetBase(TQWidget *parent, const char *n
fStack->addWidget(ConduitConfigBase::aboutPage(fStack,0L),GENERAL_ABOUT); fStack->addWidget(ConduitConfigBase::aboutPage(fStack,0L),GENERAL_ABOUT);
} }
ConduitConfigWidget::ConduitConfigWidget(TQWidget *parent, const char *n, ConduitConfigWidget::ConduitConfigWidget(TQWidget *tqparent, const char *n,
bool) : bool) :
ConduitConfigWidgetBase(parent,n), ConduitConfigWidgetBase(tqparent,n),
fConfigure(0L), fConfigure(0L),
fCurrentConduit(0L), fCurrentConduit(0L),
fGeneralPage(0L), fGeneralPage(0L),
@ -358,7 +358,7 @@ void ConduitConfigWidget::fillLists()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
// 3 QListViewItems for the three headings in the list // 3 TQListViewItems for the three headings in the list
TQListViewItem *general,*conduits; TQListViewItem *general,*conduits;
// And two generic pointers for the rest. // And two generic pointers for the rest.
@ -412,7 +412,7 @@ void ConduitConfigWidget::fillLists()
p->setText(CONDUIT_COMMENT,i18n(c)); \ p->setText(CONDUIT_COMMENT,i18n(c)); \
p->setText(CONDUIT_LIBRARY,CSL1("internal_" b)); \ p->setText(CONDUIT_LIBRARY,CSL1("internal_" b)); \
p->setText(CONDUIT_DESKTOP,CSL1("internal_" b)); \ p->setText(CONDUIT_DESKTOP,CSL1("internal_" b)); \
if (potentiallyInstalled.findIndex(p->text(CONDUIT_DESKTOP))>=0) \ if (potentiallyInstalled.tqfindIndex(p->text(CONDUIT_DESKTOP))>=0) \
p->setOriginalState(true); p->setOriginalState(true);
IC("Install Files","fileinstall", IC("Install Files","fileinstall",
@ -450,7 +450,7 @@ void ConduitConfigWidget::fillLists()
p->setText(CONDUIT_DESKTOP,o->desktopEntryName()); p->setText(CONDUIT_DESKTOP,o->desktopEntryName());
p->setText(CONDUIT_LIBRARY,o->library()); p->setText(CONDUIT_LIBRARY,o->library());
if (potentiallyInstalled.findIndex(o->desktopEntryName()) < 0) if (potentiallyInstalled.tqfindIndex(o->desktopEntryName()) < 0)
{ {
p->setOriginalState(false); p->setOriginalState(false);
} }
@ -542,7 +542,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec)
i18n("<qt>This is an internal action which has no " i18n("<qt>This is an internal action which has no "
"configuration options. " "configuration options. "
"The action's description is: <i>%1</i> " "The action's description is: <i>%1</i> "
"</qt>").arg(p->text(CONDUIT_COMMENT))); "</qt>").tqarg(p->text(CONDUIT_COMMENT)));
return; return;
} }
@ -596,7 +596,7 @@ void ConduitConfigWidget::loadAndConfigure(TQListViewItem *p) // ,bool exec)
TQStringList a; TQStringList a;
a.append(CSL1("modal")); a.append(CSL1("modal"));
o = f->create(fStack, 0L, "ConduitConfigBase", a); o = f->create(TQT_TQOBJECT(fStack), 0L, "ConduitConfigBase", a);
if (!o) if (!o)
{ {
@ -716,7 +716,7 @@ void ConduitConfigWidget::selected(TQListViewItem *p)
#endif #endif
// set the dialog title to the selected item // set the dialog title to the selected item
TQListViewItem *pParent = p->parent(); TQListViewItem *pParent = p->tqparent();
TQString title; TQString title;
title = pParent ? pParent->text(CONDUIT_NAME) + CSL1(" - ") : TQString() ; title = pParent ? pParent->text(CONDUIT_NAME) + CSL1(" - ") : TQString() ;
title += p ? p->text(CONDUIT_NAME) : i18n("KPilot Setup"); title += p ? p->text(CONDUIT_NAME) : i18n("KPilot Setup");
@ -735,7 +735,7 @@ void ConduitConfigWidget::warnNoExec(const TQListViewItem * p)
TQString msg = i18n("<qt>No library could be " TQString msg = i18n("<qt>No library could be "
"found for the conduit %1. This means that the " "found for the conduit %1. This means that the "
"conduit was not installed properly.</qt>") "conduit was not installed properly.</qt>")
.arg(p->text(CONDUIT_NAME)); .tqarg(p->text(CONDUIT_NAME));
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT << fname << ": No library for " DEBUGKPILOT << fname << ": No library for "
@ -752,7 +752,7 @@ void ConduitConfigWidget::warnNoLibrary(const TQListViewItem *p)
TQString msg = i18n("<qt>There was a problem loading the library " TQString msg = i18n("<qt>There was a problem loading the library "
"for the conduit %1. This means that the " "for the conduit %1. This means that the "
"conduit was not installed properly.</qt>") "conduit was not installed properly.</qt>")
.arg(p->text(CONDUIT_NAME)); .tqarg(p->text(CONDUIT_NAME));
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT << fname << ": Can't load library for " DEBUGKPILOT << fname << ": Can't load library for "
@ -805,7 +805,7 @@ void ConduitConfigWidget::load()
TQCheckListItem*qq=dynamic_cast<TQCheckListItem*>(q); TQCheckListItem*qq=dynamic_cast<TQCheckListItem*>(q);
if (qq) if (qq)
{ {
qq->setOn(! (potentiallyInstalled.findIndex(qq->text(CONDUIT_DESKTOP))<0) ); qq->setOn(! (potentiallyInstalled.tqfindIndex(qq->text(CONDUIT_DESKTOP))<0) );
} }
q = q->nextSibling(); q = q->nextSibling();
} }

@ -45,6 +45,7 @@ class ConduitConfig;
class ConduitConfigWidgetBase : public KCModule class ConduitConfigWidgetBase : public KCModule
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ConduitConfigWidgetBase(TQWidget *p=0L,const char *n=0L); ConduitConfigWidgetBase(TQWidget *p=0L,const char *n=0L);
@ -59,6 +60,7 @@ public:
class ConduitConfigWidget : public ConduitConfigWidgetBase class ConduitConfigWidget : public ConduitConfigWidgetBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ConduitConfigWidget(TQWidget *, ConduitConfigWidget(TQWidget *,
const char *name=0L, bool ownButtons=false); const char *name=0L, bool ownButtons=false);

@ -41,8 +41,8 @@
#include "datebookWidget.moc" #include "datebookWidget.moc"
DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) : DatebookWidget::DatebookWidget(TQWidget *tqparent, const TQString &dbpath) :
PilotComponent(parent,"component_generic",dbpath) PilotComponent(tqparent,"component_generic",dbpath)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;

@ -39,9 +39,10 @@ class KListView;
class DatebookWidget : public PilotComponent class DatebookWidget : public PilotComponent
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
DatebookWidget(TQWidget* parent, const TQString& dbpath); DatebookWidget(TQWidget* tqparent, const TQString& dbpath);
virtual ~DatebookWidget(); virtual ~DatebookWidget();
// Pilot component methods // Pilot component methods

@ -41,8 +41,8 @@ using namespace KHE;
/************************************************* /*************************************************
**************************************************/ **************************************************/
DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) : DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *tqparent) :
KDialogBase(parent, "AppBlock Editor",false, KDialogBase(tqparent, "AppBlock Editor",false,
i18n("Edit AppInfo Block"), i18n("Edit AppInfo Block"),
Ok|Cancel), Ok|Cancel),
appInfo(appInfoData), appInfo(appInfoData),
@ -66,8 +66,8 @@ DBAppInfoEditor::DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent) :
else else
{ {
TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from kdeutils)."), this ); TQLabel*tmpW = new TQLabel( i18n("To view the Application info block data, please install a hex editor (e.g. khexedit from kdeutils)."), this );
tmpW->setBackgroundMode( Qt::PaletteMid ); tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken ); tmpW->setFrameShadow( TQFrame::Sunken );
fAppInfoEdit = tmpW; fAppInfoEdit = tmpW;

@ -35,8 +35,9 @@ class TQWidget;
class DBAppInfoEditor : public KDialogBase class DBAppInfoEditor : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
DBAppInfoEditor(char*appInfoData, int l, TQWidget *parent = 0); DBAppInfoEditor(char*appInfoData, int l, TQWidget *tqparent = 0);
~DBAppInfoEditor(); ~DBAppInfoEditor();
char*appInfo; char*appInfo;
int len; int len;

@ -40,8 +40,8 @@
#include "dbFlagsEditor_base.h" #include "dbFlagsEditor_base.h"
DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *parent) : DBFlagsEditor::DBFlagsEditor(DBInfo*dbinfo, TQWidget *tqparent) :
KDialogBase(parent, "FlagsEditor",false, KDialogBase(tqparent, "FlagsEditor",false,
i18n("Edit Database Flags"), Ok|Cancel), i18n("Edit Database Flags"), Ok|Cancel),
dbi(dbinfo) dbi(dbinfo)
{ {

@ -38,8 +38,9 @@ struct DBInfo;
class DBFlagsEditor : public KDialogBase class DBFlagsEditor : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *parent = 0); DBFlagsEditor(DBInfo*dbinfo=0L, TQWidget *tqparent = 0);
~DBFlagsEditor(); ~DBFlagsEditor();
protected: protected:

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>DBFlagsEditorWidget</class> <class>DBFlagsEditorWidget</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>DBFlagsEditorWidget</cstring> <cstring>DBFlagsEditorWidget</cstring>
</property> </property>
@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </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"> <property name="name">
<cstring>fDBNameLabel</cstring> <cstring>fDBNameLabel</cstring>
</property> </property>
@ -35,7 +35,7 @@
<cstring>fDBName</cstring> <cstring>fDBName</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="3"> <widget class="TQLabel" row="1" column="3">
<property name="name"> <property name="name">
<cstring>fCreatorLabel</cstring> <cstring>fCreatorLabel</cstring>
</property> </property>
@ -54,7 +54,7 @@
<cstring>fCreator</cstring> <cstring>fCreator</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fTypeLabel</cstring> <cstring>fTypeLabel</cstring>
</property> </property>
@ -73,7 +73,7 @@
<cstring>fType</cstring> <cstring>fType</cstring>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fType</cstring> <cstring>fType</cstring>
</property> </property>
@ -81,7 +81,7 @@
<number>4</number> <number>4</number>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="1" column="4" rowspan="1" colspan="2"> <widget class="TQLineEdit" row="1" column="4" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fCreator</cstring> <cstring>fCreator</cstring>
</property> </property>
@ -89,7 +89,7 @@
<number>4</number> <number>4</number>
</property> </property>
</widget> </widget>
<widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="5"> <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="5">
<property name="name"> <property name="name">
<cstring>fDBFlagsGroup</cstring> <cstring>fDBFlagsGroup</cstring>
</property> </property>
@ -100,7 +100,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fRessourceDB</cstring> <cstring>fRessourceDB</cstring>
</property> </property>
@ -108,7 +108,7 @@
<string>&amp;Ressource database</string> <string>&amp;Ressource database</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fReadOnly</cstring> <cstring>fReadOnly</cstring>
</property> </property>
@ -116,7 +116,7 @@
<string>Rea&amp;d-only</string> <string>Rea&amp;d-only</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="2" column="0"> <widget class="TQCheckBox" row="2" column="0">
<property name="name"> <property name="name">
<cstring>fBackupDB</cstring> <cstring>fBackupDB</cstring>
</property> </property>
@ -124,7 +124,7 @@
<string>Database is &amp;backed up</string> <string>Database is &amp;backed up</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="3" column="0"> <widget class="TQCheckBox" row="3" column="0">
<property name="name"> <property name="name">
<cstring>fCopyProtect</cstring> <cstring>fCopyProtect</cstring>
</property> </property>
@ -151,7 +151,7 @@
</spacer> </spacer>
</grid> </grid>
</widget> </widget>
<widget class="QButtonGroup" row="2" column="5" rowspan="1" colspan="2"> <widget class="TQButtonGroup" row="2" column="5" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fMiscFlagsGroup</cstring> <cstring>fMiscFlagsGroup</cstring>
</property> </property>
@ -179,7 +179,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fReset</cstring> <cstring>fReset</cstring>
</property> </property>
@ -187,7 +187,7 @@
<string>Reset after &amp;installation</string> <string>Reset after &amp;installation</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fExcludeDB</cstring> <cstring>fExcludeDB</cstring>
</property> </property>
@ -197,7 +197,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox" row="3" column="0" rowspan="1" colspan="7"> <widget class="TQGroupBox" row="3" column="0" rowspan="1" colspan="7">
<property name="name"> <property name="name">
<cstring>fTimeStampGroup</cstring> <cstring>fTimeStampGroup</cstring>
</property> </property>
@ -208,7 +208,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fCreationLabel</cstring> <cstring>fCreationLabel</cstring>
</property> </property>
@ -227,7 +227,7 @@
<cstring>fCreationDate</cstring> <cstring>fCreationDate</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fModificationlabel</cstring> <cstring>fModificationlabel</cstring>
</property> </property>
@ -238,7 +238,7 @@
<cstring>fModificationDate</cstring> <cstring>fModificationDate</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>fBackupLabel</cstring> <cstring>fBackupLabel</cstring>
</property> </property>
@ -324,7 +324,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="5"> <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="5">
<property name="name"> <property name="name">
<cstring>fDBName</cstring> <cstring>fDBName</cstring>
</property> </property>

@ -2,7 +2,7 @@
** ui.h extension file, included from the uic-generated form implementation. ** ui.h extension file, included from the uic-generated form implementation.
** **
** If you wish to add, delete or rename functions or slots use ** If you wish to add, delete or rename functions or slots use
** Qt Designer which will update this file, preserving your code. Create an ** TQt Designer which will update this file, preserving your code. Create an
** init() function in place of a constructor, and a destroy() function in ** init() function in place of a constructor, and a destroy() function in
** place of a destructor. ** place of a destructor.
*****************************************************************************/ *****************************************************************************/
@ -14,7 +14,7 @@
#include <ktimewidget.h> #include <ktimewidget.h>
#else #else
#warning "Workaround for KTimeWidget in KDE 3.1" #warning "Workaround for KTimeWidget in KDE 3.1"
class KTimeWidget : public QWidget class KTimeWidget : public TQWidget
{ {
public: public:
KTimeWidget(TQWidget *p, const char *n) : TQWidget(p,n) {}; KTimeWidget(TQWidget *p, const char *n) : TQWidget(p,n) {};

@ -49,8 +49,8 @@ using namespace KHE;
DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *parent) DBRecordEditor::DBRecordEditor(PilotRecord*r, int n, TQWidget *tqparent)
: KDialogBase(parent, "RecordEditor",false,i18n("Edit Record"), : KDialogBase(tqparent, "RecordEditor",false,i18n("Edit Record"),
Ok|Cancel), rec(r), nr(n) Ok|Cancel), rec(r), nr(n)
{ {
// fWidget=new DBRecordEditorBase(this); // fWidget=new DBRecordEditorBase(this);
@ -144,7 +144,7 @@ void DBRecordEditor::initWidgets()
fFlagsGroup->tqlayout()->setSpacing( 6 ); fFlagsGroup->tqlayout()->setSpacing( 6 );
fFlagsGroup->tqlayout()->setMargin( 11 ); fFlagsGroup->tqlayout()->setMargin( 11 );
fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() ); fFlagsGroupLayout = new TQGridLayout( fFlagsGroup->tqlayout() );
fFlagsGroupLayout->tqsetAlignment( Qt::AlignTop ); fFlagsGroupLayout->tqsetAlignment( TQt::AlignTop );
fDirty = new TQCheckBox( fFlagsGroup, "fDirty" ); fDirty = new TQCheckBox( fFlagsGroup, "fDirty" );
fFlagsGroupLayout->addWidget( fDirty, 0, 0 ); fFlagsGroupLayout->addWidget( fDirty, 0, 0 );
@ -191,8 +191,8 @@ void DBRecordEditor::initWidgets()
else else
{ {
TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from kdeutils)."), fWidget ); TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. kbytesedit from kdeutils)."), fWidget );
tmpW->setBackgroundMode( Qt::PaletteMid ); tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken ); tmpW->setFrameShadow( TQFrame::Sunken );
fRecordData = tmpW; fRecordData = tmpW;

@ -34,9 +34,10 @@ class TQVBoxLayout;
class TQHBoxLayout; class TQHBoxLayout;
class TQGridLayout; class TQGridLayout;
namespace KHE { #include <khexedit/byteseditinterface.h>
class BytesEditInterface; // namespace KHE {
} // class BytesEditInterface;
// }
using namespace KHE; using namespace KHE;
class TQButtonGroup; class TQButtonGroup;
@ -52,9 +53,10 @@ class PilotRecord;
*/ */
class DBRecordEditor : public KDialogBase class DBRecordEditor : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *parent = 0); DBRecordEditor(PilotRecord*r=0L, int n=-1, TQWidget *tqparent = 0);
~DBRecordEditor(); ~DBRecordEditor();
protected: protected:

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>DBRecordEditorBase</class> <class>DBRecordEditorBase</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>DBRecordEditorBase</cstring> <cstring>DBRecordEditorBase</cstring>
</property> </property>
@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fRecordIndexLabel</cstring> <cstring>fRecordIndexLabel</cstring>
</property> </property>
@ -24,7 +24,7 @@
<string>Record index:</string> <string>Record index:</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="2"> <widget class="TQLabel" row="0" column="2">
<property name="name"> <property name="name">
<cstring>fRecordIDLabel</cstring> <cstring>fRecordIDLabel</cstring>
</property> </property>
@ -32,7 +32,7 @@
<string>Record ID:</string> <string>Record ID:</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="0" column="1"> <widget class="TQLineEdit" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fRecordIndex</cstring> <cstring>fRecordIndex</cstring>
</property> </property>
@ -43,7 +43,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="0" column="3"> <widget class="TQLineEdit" row="0" column="3">
<property name="name"> <property name="name">
<cstring>fRecordID</cstring> <cstring>fRecordID</cstring>
</property> </property>
@ -54,7 +54,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="4"> <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="4">
<property name="name"> <property name="name">
<cstring>fFlagsGroup</cstring> <cstring>fFlagsGroup</cstring>
</property> </property>
@ -73,7 +73,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fDirty</cstring> <cstring>fDirty</cstring>
</property> </property>
@ -81,7 +81,7 @@
<string>&amp;Dirty</string> <string>&amp;Dirty</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fDeleted</cstring> <cstring>fDeleted</cstring>
</property> </property>
@ -89,7 +89,7 @@
<string>&amp;Deleted</string> <string>&amp;Deleted</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="0" column="1"> <widget class="TQCheckBox" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fBusy</cstring> <cstring>fBusy</cstring>
</property> </property>
@ -97,7 +97,7 @@
<string>Busy</string> <string>Busy</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="1" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fSecret</cstring> <cstring>fSecret</cstring>
</property> </property>
@ -105,7 +105,7 @@
<string>&amp;Secret</string> <string>&amp;Secret</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="0" column="2"> <widget class="TQCheckBox" row="0" column="2">
<property name="name"> <property name="name">
<cstring>fArchived</cstring> <cstring>fArchived</cstring>
</property> </property>

@ -43,7 +43,7 @@
KPilotDBSelectionDialog::KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs, KPilotDBSelectionDialog::KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs,
TQStringList &addedDBs, TQWidget *w, const char *n) : TQStringList &addedDBs, TQWidget *w, const char *n) :
KDialogBase(w, n, true, TQString::null, KDialogBase::Ok | KDialogBase::Cancel, KDialogBase(w, n, true, TQString(), KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, false), KDialogBase::Ok, false),
fSelectedDBs(selectedDBs), fSelectedDBs(selectedDBs),
fAddedDBs(addedDBs), fAddedDBs(addedDBs),

@ -37,6 +37,7 @@ class KPilotDBSelectionWidget;
class KPilotDBSelectionDialog : public KDialogBase class KPilotDBSelectionDialog : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs, KPilotDBSelectionDialog(TQStringList &selectedDBs, TQStringList &deviceDBs,
TQStringList &addedDBs, TQWidget *, const char *); TQStringList &addedDBs, TQWidget *, const char *);

@ -1,7 +1,7 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KPilotDBSelectionWidget</class> <class>KPilotDBSelectionWidget</class>
<author>Reinhold Kainhofer</author> <author>Reinhold Kainhofer</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>DBSelectionWidgetForm</cstring> <cstring>DBSelectionWidgetForm</cstring>
</property> </property>

@ -64,8 +64,8 @@
#include "dbviewerWidget.moc" #include "dbviewerWidget.moc"
GenericDBWidget::GenericDBWidget(TQWidget *parent, const TQString &dbpath) : GenericDBWidget::GenericDBWidget(TQWidget *tqparent, const TQString &dbpath) :
PilotComponent(parent,"component_generic",dbpath), fDB(0L) PilotComponent(tqparent,"component_generic",dbpath), fDB(0L)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
setupWidget(); setupWidget();
@ -148,7 +148,7 @@ GenericDBWidget::~GenericDBWidget()
void GenericDBWidget::showComponent() void GenericDBWidget::showComponent()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fDBInfo->setText(TQString::null); fDBInfo->setText(TQString());
slotDBType(0); slotDBType(0);
fDBList->show(); fDBList->show();
@ -187,12 +187,12 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
if (!fDB || !fDB->isOpen()) if (!fDB || !fDB->isOpen())
{ {
fDBInfo->setText(i18n("<B>Warning:</B> Cannot read " fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
"database file %1.").arg(currentDB)); "database file %1.").tqarg(currentDB));
return; return;
} }
dbinfo=fDB->getDBInfo(); dbinfo=fDB->getDBInfo();
display.append(i18n("<B>Database:</B> %1, %2 records<BR>") display.append(i18n("<B>Database:</B> %1, %2 records<BR>")
.arg(TQString::tqfromLatin1(dbinfo.name)).arg(fDB->recordCount())); .tqarg(TQString::tqfromLatin1(dbinfo.name)).tqarg(fDB->recordCount()));
char buff[5]; char buff[5];
set_long(buff, dbinfo.type); set_long(buff, dbinfo.type);
buff[4]='\0'; buff[4]='\0';
@ -200,7 +200,7 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
set_long(buff, dbinfo.creator); set_long(buff, dbinfo.creator);
buff[4]='\0'; buff[4]='\0';
TQString cr = TQString::tqfromLatin1(buff); TQString cr = TQString::tqfromLatin1(buff);
display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").arg(tp).arg(cr)); display.append(i18n("<B>Type:</B> %1, <B>Creator:</B> %2<br><br>").tqarg(tp).tqarg(cr));
int currentRecord = 0; int currentRecord = 0;
PilotRecord *pilotRec; PilotRecord *pilotRec;
@ -216,7 +216,7 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
PilotListViewItem*item=new PilotListViewItem(fRecordList, PilotListViewItem*item=new PilotListViewItem(fRecordList,
TQString::number(currentRecord), TQString::number(pilotRec->size()), TQString::number(currentRecord), TQString::number(pilotRec->size()),
TQString::number(pilotRec->id()), TQString::number(pilotRec->id()),
TQString::null, TQString(),
pilotRec->id(), pilotRec); pilotRec->id(), pilotRec);
item->setNumericCol(0, true); item->setNumericCol(0, true);
item->setNumericCol(1, true); item->setNumericCol(1, true);
@ -244,33 +244,33 @@ void GenericDBWidget::slotSelected(const TQString &dbname)
if (!pf) if (!pf)
{ {
fDBInfo->setText(i18n("<B>Warning:</B> Cannot read " fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
"application file %1.").arg(dbname)); "application file %1.").tqarg(dbname));
return; return;
} }
#if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0 #if PILOT_LINK_NUMBER < PILOT_LINK_0_12_0
if (pi_file_get_info(pf,&dbinfo)) if (pi_file_get_info(pf,&dbinfo))
{ {
fDBInfo->setText(i18n("<B>Warning:</B> Cannot read " fDBInfo->setText(i18n("<B>Warning:</B> Cannot read "
"application file %1.").arg(dbname)); "application file %1.").tqarg(dbname));
return; return;
} }
#else #else
pi_file_get_info(pf,&dbinfo); pi_file_get_info(pf,&dbinfo);
#endif #endif
display.append(i18n("<B>Application:</B> %1<BR><BR>").arg(dbname)); display.append(i18n("<B>Application:</B> %1<BR><BR>").tqarg(dbname));
} }
enableWidgets(currentDBtype==eDatabase); enableWidgets(currentDBtype==eDatabase);
TQDateTime ttime; TQDateTime ttime;
ttime.setTime_t(dbinfo.createDate); ttime.setTime_t(dbinfo.createDate);
display.append(i18n("Created: %1<BR>").arg(ttime.toString())); display.append(i18n("Created: %1<BR>").tqarg(ttime.toString()));
ttime.setTime_t(dbinfo.modifyDate); ttime.setTime_t(dbinfo.modifyDate);
display.append(i18n("Modified: %1<BR>").arg(ttime.toString())); display.append(i18n("Modified: %1<BR>").tqarg(ttime.toString()));
ttime.setTime_t(dbinfo.backupDate); ttime.setTime_t(dbinfo.backupDate);
display.append(i18n("Backed up: %1<BR>").arg(ttime.toString())); display.append(i18n("Backed up: %1<BR>").tqarg(ttime.toString()));
fDBInfo->setText(display); fDBInfo->setText(display);
} }
@ -304,7 +304,7 @@ void GenericDBWidget::reset()
fDBInfo->clear(); fDBInfo->clear();
fRecordList->clear(); fRecordList->clear();
if (fDB) KPILOT_DELETE(fDB); if (fDB) KPILOT_DELETE(fDB);
currentDB=TQString::null; currentDB=TQString();
} }
void GenericDBWidget::slotAddRecord() void GenericDBWidget::slotAddRecord()
@ -314,7 +314,7 @@ void GenericDBWidget::slotAddRecord()
PilotRecord *rec=new PilotRecord(b, 0, 0, 0); PilotRecord *rec=new PilotRecord(b, 0, 0, 0);
PilotListViewItem*item=new PilotListViewItem(fRecordList, PilotListViewItem*item=new PilotListViewItem(fRecordList,
TQString::number(-1), TQString::number(rec->size()), TQString::number(-1), TQString::number(rec->size()),
TQString::number(rec->id()), TQString::null, TQString::number(rec->id()), TQString(),
rec->id(), rec); rec->id(), rec);
if (slotEditRecord(item)) if (slotEditRecord(item))
{ {

@ -43,9 +43,10 @@ class KListView;
class GenericDBWidget : public PilotComponent class GenericDBWidget : public PilotComponent
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
GenericDBWidget(TQWidget* parent, const TQString& dbpath); GenericDBWidget(TQWidget* tqparent, const TQString& dbpath);
virtual ~GenericDBWidget(); virtual ~GenericDBWidget();
// Pilot component methods // Pilot component methods

@ -58,9 +58,9 @@
#include "fileInstallWidget.moc" #include "fileInstallWidget.moc"
FileInstallWidget::FileInstallWidget(TQWidget * parent, FileInstallWidget::FileInstallWidget(TQWidget * tqparent,
const TQString & path) : const TQString & path) :
PilotComponent(parent, "component_files", path), PilotComponent(tqparent, "component_files", path),
fSaveFileList(false), fSaveFileList(false),
fInstaller(0L) fInstaller(0L)
{ {
@ -116,7 +116,7 @@ FileInstallWidget::~FileInstallWidget()
static inline bool pdbOrPrc(const TQString &s) static inline bool pdbOrPrc(const TQString &s)
{ {
return s.endsWith(CSL1(".pdb"),false) || s.endsWith(CSL1(".prc"),false) ; return s.tqendsWith(CSL1(".pdb"),false) || s.tqendsWith(CSL1(".prc"),false) ;
} }
void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event) void FileInstallWidget::dragEnterEvent(TQDragEnterEvent *event)
@ -145,7 +145,7 @@ bool FileInstallWidget::eventFilter(TQObject *watched, TQEvent *event)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if(watched == fIconView->viewport()) if(TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(fIconView->viewport()))
{ {
if(event->type() == TQEvent::DragEnter) { if(event->type() == TQEvent::DragEnter) {
dragEnterEvent(static_cast<TQDragEnterEvent*>(event)); dragEnterEvent(static_cast<TQDragEnterEvent*>(event));
@ -159,7 +159,7 @@ bool FileInstallWidget::eventFilter(TQObject *watched, TQEvent *event)
} }
if(event->type() == TQEvent::MouseButtonPress) { if(event->type() == TQEvent::MouseButtonPress) {
contextMenu(static_cast<TQMouseEvent*>(event)); contextMenu(TQT_TQMOUSEEVENT(event));
} }
} }
@ -214,7 +214,7 @@ void FileInstallWidget::slotAddFile()
if (!shown) return; if (!shown) return;
TQStringList fileNames = KFileDialog::getOpenFileNames( TQStringList fileNames = KFileDialog::getOpenFileNames(
TQString::null, i18n("*.pdb *.prc|PalmOS Databases (*.pdb *.prc)")); TQString(), i18n("*.pdb *.prc|PalmOS Databases (*.pdb *.prc)"));
for (TQStringList::Iterator fileName = fileNames.begin(); fileName != fileNames.end(); ++fileName) for (TQStringList::Iterator fileName = fileNames.begin(); fileName != fileNames.end(); ++fileName)
{ {
@ -285,7 +285,7 @@ void FileInstallWidget::contextMenu(TQMouseEvent *event)
TQPopupMenu popup(fIconView); TQPopupMenu popup(fIconView);
item = fIconView->findItem(event->pos()); item = fIconView->tqfindItem(event->pos());
if(item) { if(item) {
// Popup for the right clicked item // Popup for the right clicked item
popup.insertItem(i18n("Delete a single file item","Delete"), 10); popup.insertItem(i18n("Delete a single file item","Delete"), 10);

@ -45,9 +45,10 @@ class FileInstaller;
class FileInstallWidget : public PilotComponent class FileInstallWidget : public PilotComponent
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
FileInstallWidget(TQWidget* parent, const TQString& dbPath); FileInstallWidget(TQWidget* tqparent, const TQString& dbPath);
virtual ~FileInstallWidget(); virtual ~FileInstallWidget();
// Pilot Component Methods: // Pilot Component Methods:

@ -105,8 +105,8 @@ void FileInstaller::deleteFiles(const TQStringList &files)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if(!(s.endsWith(CSL1(".pdb"), false) || s.endsWith(CSL1(".prc"), false))) { if(!(s.tqendsWith(CSL1(".pdb"), false) || s.tqendsWith(CSL1(".prc"), false))) {
KMessageBox::detailedSorry(w, i18n("Cannot install %1").arg(s), KMessageBox::detailedSorry(w, i18n("Cannot install %1").tqarg(s),
i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer.")); i18n("Only PalmOS database files (like *.pdb and *.prc) can be installed by the file installer."));
return false; return false;
} }

@ -39,9 +39,10 @@
class TQStringList; class TQStringList;
class TQString; class TQString;
class FileInstaller : public QObject class FileInstaller : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
FileInstaller(); FileInstaller();
virtual ~FileInstaller(); virtual ~FileInstaller();

@ -65,10 +65,10 @@
#include "hotSync.moc" #include "hotSync.moc"
class BackupAction::Thread : public QThread class BackupAction::Thread : public TQThread
{ {
public: public:
Thread( BackupAction *parent, Thread( BackupAction *tqparent,
KPilotLink *link, KPilotLink *link,
const TQString &filename, const TQString &filename,
const DBInfo *info ); const DBInfo *info );
@ -151,7 +151,7 @@ public:
return false; return false;
} }
if (fNoBackupCreators.findIndex(info->creator) != -1) if (fNoBackupCreators.tqfindIndex(info->creator) != -1)
{ {
return false; return false;
} }
@ -270,7 +270,7 @@ static inline void initNoBackup(TQStringList &dbnames,
unsigned long tag = *i; unsigned long tag = *i;
pi_untag(buf,tag); pi_untag(buf,tag);
buf[4]=0; buf[4]=0;
creatorids.append(CSL1("[%1]").arg(buf)); creatorids.append(CSL1("[%1]").tqarg(buf));
} }
DEBUGKPILOT << fname << ": Will skip creators " << creatorids << endl; DEBUGKPILOT << fname << ": Will skip creators " << creatorids << endl;
} }
@ -336,7 +336,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
fP->fBackupDir = fP->fPreferBackupDir; fP->fBackupDir = fP->fPreferBackupDir;
} }
logMessage(i18n("Backup directory: %1.").arg(fP->fBackupDir)); logMessage(i18n("Backup directory: %1.").tqarg(fP->fBackupDir));
DEBUGKPILOT << fname DEBUGKPILOT << fname
<< ": This Pilot user's name is \"" << ": This Pilot user's name is \""
@ -349,18 +349,18 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
if (fP->fFullBackup) if (fP->fFullBackup)
{ {
fActionStatus = FullBackup; fActiontqStatus = FullBackup;
addSyncLogEntry(i18n("Full backup started.")); addSyncLogEntry(i18n("Full backup started."));
} }
else else
{ {
fActionStatus = FastBackup; fActiontqStatus = FastBackup;
addSyncLogEntry(i18n("Fast backup started")); addSyncLogEntry(i18n("Fast backup started"));
} }
if (!checkBackupDirectory(fP->fBackupDir)) if (!checkBackupDirectory(fP->fBackupDir))
{ {
fActionStatus=BackupIncomplete; fActiontqStatus=BackupIncomplete;
// Don't issue an error message, checkBackupDirectory // Don't issue an error message, checkBackupDirectory
// did this already... // did this already...
return false; return false;
@ -380,13 +380,13 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
struct DBInfo info; struct DBInfo info;
// TODO: make the progress reporting more accurate // TODO: make the progress reporting more accurate
emit logProgress(TQString::null, fP->fDBIndex); emit logProgress(TQString(), fP->fDBIndex);
if (openConduit() < 0) if (openConduit() < 0)
{ {
addSyncLogEntry(i18n("Exiting on cancel.")); addSyncLogEntry(i18n("Exiting on cancel."));
endBackup(); endBackup();
fActionStatus = BackupIncomplete; fActiontqStatus = BackupIncomplete;
return; return;
} }
@ -403,7 +403,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
addSyncLogEntry( i18n("Fast backup complete.") ); addSyncLogEntry( i18n("Fast backup complete.") );
} }
endBackup(); endBackup();
fActionStatus = BackupComplete; fActiontqStatus = BackupComplete;
return; return;
} }
@ -416,7 +416,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
// only backup data, not applications. // only backup data, not applications.
if ( (fP->fFullBackup) || !PilotDatabase::isResource(&info) ) if ( (fP->fFullBackup) || !PilotDatabase::isResource(&info) )
{ {
addSyncLogEntry(i18n("Backing up: %1").arg(Pilot::fromPilot(info.name))); addSyncLogEntry(i18n("Backing up: %1").tqarg(Pilot::fromPilot(info.name)));
if (!startBackupThread(&info)) if (!startBackupThread(&info))
{ {
@ -445,7 +445,7 @@ static inline bool checkBackupDirectory( const TQString &backupDir )
DEBUGKPILOT << fname << ": Skipping database <" << info.name DEBUGKPILOT << fname << ": Skipping database <" << info.name
<< "> (no-backup list)" << endl; << "> (no-backup list)" << endl;
TQString s = i18n("Skipping %1") TQString s = i18n("Skipping %1")
.arg(Pilot::fromPilot(info.name)); .tqarg(Pilot::fromPilot(info.name));
addSyncLogEntry(s); addSyncLogEntry(s);
} }
TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB())); TQTimer::singleShot(0,this,TQT_SLOT(backupOneDB()));
@ -480,7 +480,7 @@ bool BackupAction::startBackupThread(DBInfo *info)
WARNINGKPILOT << "Unable to open database <" << info->name << ">" << endl; WARNINGKPILOT << "Unable to open database <" << info->name << ">" << endl;
KPILOT_DELETE(serial); KPILOT_DELETE(serial);
addSyncLogEntry(i18n("Backup of %1 failed.\n") addSyncLogEntry(i18n("Backup of %1 failed.\n")
.arg(Pilot::fromPilot(info->name))); .tqarg(Pilot::fromPilot(info->name)));
return false; return false;
} }
@ -557,7 +557,7 @@ void BackupAction::endBackup()
FUNCTIONSETUP; FUNCTIONSETUP;
fP->fDBIndex = (-1); fP->fDBIndex = (-1);
fActionStatus = BackupEnded; fActiontqStatus = BackupEnded;
fP->fDeviceDBs.sort(); fP->fDeviceDBs.sort();
TQString old( TQString::null ); TQString old( TQString::null );
TQStringList::Iterator itr = fP->fDeviceDBs.begin(); TQStringList::Iterator itr = fP->fDeviceDBs.begin();
@ -660,7 +660,7 @@ FileInstallAction::~FileInstallAction()
DEBUGKPILOT << fname << ": Installing file " << filePath << endl; DEBUGKPILOT << fname << ": Installing file " << filePath << endl;
#endif #endif
TQString m = i18n("Installing %1").arg(fileName); TQString m = i18n("Installing %1").tqarg(fileName);
emit logProgress(m,(100 * fDBIndex) / (fList.count()+1)); emit logProgress(m,(100 * fDBIndex) / (fList.count()+1));
m+=CSL1("\n"); m+=CSL1("\n");
emit addSyncLogEntry(m,false /* Don't print in KPilot's log. */ ); emit addSyncLogEntry(m,false /* Don't print in KPilot's log. */ );
@ -748,7 +748,7 @@ bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &fil
emit logError(i18n("The database in &quot;%1&quot; has a " emit logError(i18n("The database in &quot;%1&quot; has a "
"resource name that is longer than 31 characters. " "resource name that is longer than 31 characters. "
"This suggests a bug in the tool used to create the database. " "This suggests a bug in the tool used to create the database. "
"KPilot cannot install this database.").arg(fileName)); "KPilot cannot install this database.").tqarg(fileName));
} }
return r; return r;
@ -769,7 +769,7 @@ bool FileInstallAction::resourceOK(const TQString &fileName, const TQString &fil
} }
else else
{ {
return TQString(CSL1("Installing %1")).arg(fList[fDBIndex]); return TQString(CSL1("Installing %1")).tqarg(fList[fDBIndex]);
} }
} }
} }
@ -809,7 +809,7 @@ CheckUser::~CheckUser()
"handheld have a username set. " "handheld have a username set. "
"They <i>should</i> be set. " "They <i>should</i> be set. "
"Should KPilot set them to a default value " "Should KPilot set them to a default value "
"(<i>%1</i>)?</qt>").arg(defaultUserName); "(<i>%1</i>)?</qt>").tqarg(defaultUserName);
if (questionYesNo(q, i18n("User Unknown") /* ,"askUserNone" */) == if (questionYesNo(q, i18n("User Unknown") /* ,"askUserNone" */) ==
KMessageBox::Yes) KMessageBox::Yes)
@ -844,7 +844,7 @@ CheckUser::~CheckUser()
q += i18n("KPilot has a username set " q += i18n("KPilot has a username set "
"(<i>%1</i>) but the handheld does not. " "(<i>%1</i>) but the handheld does not. "
"Should KPilot's username be set in the " "Should KPilot's username be set in the "
"handheld as well?").arg(guiUserName); "handheld as well?").tqarg(guiUserName);
q += i18n("<br/>(<i>Note:</i> If your handheld " q += i18n("<br/>(<i>Note:</i> If your handheld "
"has been reset to factory defaults, you " "has been reset to factory defaults, you "
"should use <i>Restore</i> instead of a " "should use <i>Restore</i> instead of a "
@ -885,7 +885,7 @@ CheckUser::~CheckUser()
int r = questionYesNoCancel(q, int r = questionYesNoCancel(q,
i18n("User Mismatch"), i18n("User Mismatch"),
TQString::null, TQString(),
20, 20,
i18n("Use KPilot Name"), i18n("Use KPilot Name"),
i18n("Use Handheld Name")); i18n("Use Handheld Name"));
@ -986,14 +986,14 @@ void RestoreAction::setDirectory( const TQString &path )
DEBUGKPILOT << fname << ": Restoring user " << dirname << endl; DEBUGKPILOT << fname << ": Restoring user " << dirname << endl;
#endif #endif
TQDir dir(dirname, TQString::null, TQDir::Name, TQDir dir(dirname, TQString(), TQDir::Name,
TQDir::Files | TQDir::Readable | TQDir::NoSymLinks); TQDir::Files | TQDir::Readable | TQDir::NoSymLinks);
if (!dir.exists()) if (!dir.exists())
{ {
WARNINGKPILOT << "Restore directory " WARNINGKPILOT << "Restore directory "
<< dirname << " does not exist." << endl; << dirname << " does not exist." << endl;
fActionStatus = Error; fActiontqStatus = Error;
addSyncLogEntry(i18n("Restore directory does not exist.") + addSyncLogEntry(i18n("Restore directory does not exist.") +
CSL1(" ") + i18n("Restore not performed.")); CSL1(" ") + i18n("Restore not performed."));
return false; return false;
@ -1021,7 +1021,7 @@ void RestoreAction::setDirectory( const TQString &path )
} }
emit logProgress(i18n("Restoring %1...").arg(TQString::null),1); emit logProgress(i18n("Restoring %1...").tqarg(TQString()),1);
for (unsigned int i = 0; i < dir.count(); i++) for (unsigned int i = 0; i < dir.count(); i++)
{ {
@ -1041,13 +1041,13 @@ void RestoreAction::setDirectory( const TQString &path )
else else
{ {
WARNINGKPILOT << "Can't open " << s << endl; WARNINGKPILOT << "Can't open " << s << endl;
logMessage(i18n("File '%1' cannot be read.").arg(s)); logMessage(i18n("File '%1' cannot be read.").tqarg(s));
} }
} }
fP->fDBIndex = 0; fP->fDBIndex = 0;
fP->fDBIterator = fP->fDBList.begin(); fP->fDBIterator = fP->fDBList.begin();
fActionStatus = InstallingFiles; fActiontqStatus = InstallingFiles;
TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()), TQObject::connect(&(fP->fTimer), TQT_SIGNAL(timeout()),
this, TQT_SLOT(installNextFile())); this, TQT_SLOT(installNextFile()));
@ -1060,14 +1060,14 @@ void RestoreAction::setDirectory( const TQString &path )
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
Q_ASSERT(fActionStatus == InstallingFiles); Q_ASSERT(fActiontqStatus == InstallingFiles);
if (fP->fDBIterator == fP->fDBList.end()) if (fP->fDBIterator == fP->fDBList.end())
{ {
fP->fTimer.stop(); fP->fTimer.stop();
fActionStatus = Done; fActiontqStatus = Done;
addSyncLogEntry(i18n("OK.")); addSyncLogEntry(i18n("OK."));
delayDone(); delayDone();
return; return;
@ -1081,9 +1081,9 @@ void RestoreAction::setDirectory( const TQString &path )
if (openConduit() < 0) if (openConduit() < 0)
{ {
WARNINGKPILOT << "Restore apparently canceled." << endl; WARNINGKPILOT << "Restore aptqparently canceled." << endl;
logMessage(i18n("Restore incomplete.")); logMessage(i18n("Restore incomplete."));
fActionStatus = Done; fActiontqStatus = Done;
emit syncDone(this); emit syncDone(this);
return; return;
@ -1091,14 +1091,14 @@ void RestoreAction::setDirectory( const TQString &path )
TQFileInfo databaseInfo(dbi.path); TQFileInfo databaseInfo(dbi.path);
addSyncLogEntry(databaseInfo.fileName()); addSyncLogEntry(databaseInfo.fileName());
emit logProgress(i18n("Restoring %1...").arg(databaseInfo.fileName()), emit logProgress(i18n("Restoring %1...").tqarg(databaseInfo.fileName()),
(100*fP->fDBIndex) / (fP->fDBList.count()+1)) ; (100*fP->fDBIndex) / (fP->fDBList.count()+1)) ;
if ( !deviceLink()->installFiles( dbi.path, false /* don't delete */ ) ) if ( !deviceLink()->installFiles( dbi.path, false /* don't delete */ ) )
{ {
WARNINGKPILOT << "Couldn't restore " << dbi.path << endl; WARNINGKPILOT << "Couldn't restore " << dbi.path << endl;
logError(i18n("Cannot restore file `%1'.") logError(i18n("Cannot restore file `%1'.")
.arg(databaseInfo.fileName())); .tqarg(databaseInfo.fileName()));
} }
} }
@ -1128,12 +1128,12 @@ void RestoreAction::setDirectory( const TQString &path )
BackupAction::Thread::Thread( BackupAction *parent, BackupAction::Thread::Thread( BackupAction *tqparent,
KPilotLink *link, KPilotLink *link,
const TQString &filename, const TQString &filename,
const DBInfo *info ) const DBInfo *info )
{ {
fParent = parent; fParent = tqparent;
fLink = link; fLink = link;
fFilename = filename; fFilename = filename;
memcpy(&fDBInfo,info,sizeof(DBInfo)); memcpy(&fDBInfo,info,sizeof(DBInfo));

@ -52,6 +52,7 @@ protected:
class BackupAction : public SyncAction class BackupAction : public SyncAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** Constructor. Back up all the databases on /** Constructor. Back up all the databases on
@ -64,7 +65,7 @@ public:
*/ */
BackupAction(KPilotLink *, bool full); BackupAction(KPilotLink *, bool full);
enum Status { Init, enum tqStatus { Init,
Error, Error,
FastBackup, FastBackup,
FullBackup, FullBackup,
@ -117,6 +118,7 @@ private:
class FileInstallAction : public SyncAction class FileInstallAction : public SyncAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
FileInstallAction(KPilotLink *, FileInstallAction(KPilotLink *,
const TQString &fileDir); const TQString &fileDir);
@ -144,10 +146,11 @@ private:
class RestoreAction : public SyncAction class RestoreAction : public SyncAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
RestoreAction(KPilotLink *,TQWidget *w=0L); RestoreAction(KPilotLink *,TQWidget *w=0L);
typedef enum { InstallingFiles, GettingFileInfo,Done } Status; typedef enum { InstallingFiles, GettingFileInfo,Done } tqStatus;
virtual TQString statusString() const; virtual TQString statusString() const;
/** By default, a path based on the user name (either /** By default, a path based on the user name (either

@ -60,7 +60,7 @@ bool InternalEditorAction::exec()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
emit logMessage(i18n("[Internal Editors]")); emit logMessage(i18n("[Internal Editors]"));
fInternalEditorSyncStatus=eSyncStarted; fInternalEditorSynctqStatus=eSyncStarted;
TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB())); TQTimer::singleShot(0, this, TQT_SLOT(syncDirtyDB()));
return true; return true;
} }
@ -69,11 +69,11 @@ void InternalEditorAction::syncDirtyDB()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if (fInternalEditorSyncStatus!=eSyncDirtyDB) if (fInternalEditorSynctqStatus!=eSyncDirtyDB)
{ {
fInternalEditorSyncStatus=eSyncDirtyDB; fInternalEditorSynctqStatus=eSyncDirtyDB;
dirtyDBs=KPilotSettings::dirtyDatabases(); dirtyDBs=KPilotSettings::dirtyDatabases();
emit logMessage(i18n("Databases with changed records: %1").arg(dirtyDBs.join(CSL1(", ")))); emit logMessage(i18n("Databases with changed records: %1").tqarg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin(); dbIter=dirtyDBs.begin();
} }
else else
@ -99,7 +99,7 @@ void InternalEditorAction::syncDirtyDB()
if (!localDB->isOpen() || !serialDB->isOpen()) if (!localDB->isOpen() || !serialDB->isOpen())
{ {
emit logError(i18n("Unable to open the serial or local database for %1. " emit logError(i18n("Unable to open the serial or local database for %1. "
"Skipping it.").arg(*dbIter)); "Skipping it.").tqarg(*dbIter));
goto nextDB; goto nextDB;
} }
while ( (rec=localDB->readNextModifiedRec()) ) while ( (rec=localDB->readNextModifiedRec()) )
@ -161,8 +161,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
PilotAddress localAddr(localrec); PilotAddress localAddr(localrec);
PilotAddress serialAddr(serialrec); PilotAddress serialAddr(serialrec);
localEntry=localAddr.getTextRepresentation(&info,Qt::RichText); localEntry=localAddr.getTextRepresentation(&info,TQt::RichText);
serialEntry=serialAddr.getTextRepresentation(&info,Qt::RichText); serialEntry=serialAddr.getTextRepresentation(&info,TQt::RichText);
recType=i18n("address"); recType=i18n("address");
} }
else else
@ -172,8 +172,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
PilotTodoEntry localTodo(localrec); PilotTodoEntry localTodo(localrec);
PilotTodoEntry serialTodo(serialrec); PilotTodoEntry serialTodo(serialrec);
localEntry=localTodo.getTextRepresentation(Qt::RichText); localEntry=localTodo.getTextRepresentation(TQt::RichText);
serialEntry=serialTodo.getTextRepresentation(Qt::RichText); serialEntry=serialTodo.getTextRepresentation(TQt::RichText);
recType=i18n("to-do entry"); recType=i18n("to-do entry");
} }
else else
@ -181,8 +181,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
{ {
PilotMemo localMemo(localrec); PilotMemo localMemo(localrec);
PilotMemo serialMemo(serialrec); PilotMemo serialMemo(serialrec);
localEntry=localMemo.getTextRepresentation(Qt::RichText); localEntry=localMemo.getTextRepresentation(TQt::RichText);
serialEntry=serialMemo.getTextRepresentation(Qt::RichText); serialEntry=serialMemo.getTextRepresentation(TQt::RichText);
recType=i18n("memo"); recType=i18n("memo");
} }
else else
@ -192,8 +192,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
PilotDateEntry localEvent(localrec); PilotDateEntry localEvent(localrec);
PilotDateEntry serialEvent(serialrec); PilotDateEntry serialEvent(serialrec);
localEntry=localEvent.getTextRepresentation(Qt::RichText); localEntry=localEvent.getTextRepresentation(TQt::RichText);
serialEntry=serialEvent.getTextRepresentation(Qt::RichText); serialEntry=serialEvent.getTextRepresentation(TQt::RichText);
recType=i18n("calendar entry"); recType=i18n("calendar entry");
} }
else else
@ -203,10 +203,10 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
TQString dialogText(i18n("The %1 with ID %2 of the database \"%3\" was changed " TQString dialogText(i18n("The %1 with ID %2 of the database \"%3\" was changed "
"on the handheld and in the internal editor. Shall the changes in KPilot be copied to the handheld, and so override the changes there?"). "on the handheld and in the internal editor. Shall the changes in KPilot be copied to the handheld, and so override the changes there?").
arg(recType).arg(id).arg(dbName)); tqarg(recType).tqarg(id).tqarg(dbName));
KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true, KDialogBase*resdlg=new KDialogBase(0L, "internalresolutiondialog", true,
i18n("Conflict in database %1").arg(*dbIter), i18n("Conflict in database %1").tqarg(*dbIter),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true,
i18n("Use KPilot"), i18n("Use Handheld") ); i18n("Use KPilot"), i18n("Use Handheld") );
resdlg->setButtonText(KDialogBase::Ok, i18n("Use &KPilot")); resdlg->setButtonText(KDialogBase::Ok, i18n("Use &KPilot"));
@ -228,14 +228,14 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
label=new TQLabel(i18n("Entry in KPilot"), page); label=new TQLabel(i18n("Entry in KPilot"), page);
tqlayout->addWidget( label, 2,0); tqlayout->addWidget( label, 2,0);
KTextEdit*textBrowser = new KTextEdit(CSL1("<qt>")+localEntry+CSL1("</qt>"), TQString::null, page); KTextEdit*textBrowser = new KTextEdit(CSL1("<qt>")+localEntry+CSL1("</qt>"), TQString(), page);
textBrowser->setReadOnly(true); textBrowser->setReadOnly(true);
tqlayout->addWidget( textBrowser, 3,0); tqlayout->addWidget( textBrowser, 3,0);
label=new TQLabel(i18n("Entry on Handheld"), page); label=new TQLabel(i18n("Entry on Handheld"), page);
tqlayout->addWidget( label, 2,1); tqlayout->addWidget( label, 2,1);
textBrowser = new KTextEdit(CSL1("<qt>")+serialEntry+CSL1("</qt>"), TQString::null, page); textBrowser = new KTextEdit(CSL1("<qt>")+serialEntry+CSL1("</qt>"), TQString(), page);
textBrowser->setReadOnly(true); textBrowser->setReadOnly(true);
tqlayout->addWidget( textBrowser, 3,1); tqlayout->addWidget( textBrowser, 3,1);
} }
@ -261,8 +261,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
else else
{ {
TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page ); TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page );
tmpW->setBackgroundMode( Qt::PaletteMid ); tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken ); tmpW->setFrameShadow( TQFrame::Sunken );
hexEdit = tmpW; hexEdit = tmpW;
@ -289,8 +289,8 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
else else
{ {
TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page ); TQLabel*tmpW = new TQLabel( i18n("To view and edit the record data, please install a hex editor (e.g. khexedit from kdeutils)."), page );
tmpW->setBackgroundMode( Qt::PaletteMid ); tmpW->setBackgroundMode( TQt::PaletteMid );
tmpW->tqsetAlignment( Qt::AlignHCenter | Qt::AlignVCenter | Qt::WordBreak); tmpW->tqsetAlignment( TQt::AlignHCenter | TQt::AlignVCenter | TQt::WordBreak);
tmpW->setFrameShape( TQFrame::Panel ); tmpW->setFrameShape( TQFrame::Panel );
tmpW->setFrameShadow( TQFrame::Sunken ); tmpW->setFrameShadow( TQFrame::Sunken );
hexEdit = tmpW; hexEdit = tmpW;
@ -308,11 +308,11 @@ bool InternalEditorAction::queryUseKPilotChanges(TQString dbName, recordid_t id,
void InternalEditorAction::syncFlagsChangedDB() void InternalEditorAction::syncFlagsChangedDB()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if (fInternalEditorSyncStatus!=eSyncFlagsChangedDB) if (fInternalEditorSynctqStatus!=eSyncFlagsChangedDB)
{ {
fInternalEditorSyncStatus=eSyncFlagsChangedDB; fInternalEditorSynctqStatus=eSyncFlagsChangedDB;
dirtyDBs=KPilotSettings::flagsChangedDatabases(); dirtyDBs=KPilotSettings::flagsChangedDatabases();
emit logMessage(i18n("Databases with changed flags: %1").arg(dirtyDBs.join(CSL1(", ")))); emit logMessage(i18n("Databases with changed flags: %1").tqarg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin(); dbIter=dirtyDBs.begin();
} }
else else
@ -349,11 +349,11 @@ return;
void InternalEditorAction::syncAppBlockChangedDB() void InternalEditorAction::syncAppBlockChangedDB()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if (fInternalEditorSyncStatus!=eSyncAppBlockChangedDB) if (fInternalEditorSynctqStatus!=eSyncAppBlockChangedDB)
{ {
fInternalEditorSyncStatus=eSyncAppBlockChangedDB; fInternalEditorSynctqStatus=eSyncAppBlockChangedDB;
dirtyDBs=KPilotSettings::appBlockChangedDatabases(); dirtyDBs=KPilotSettings::appBlockChangedDatabases();
emit logMessage(i18n("Databases with changed AppBlock: %1").arg(dirtyDBs.join(CSL1(", ")))); emit logMessage(i18n("Databases with changed AppBlock: %1").tqarg(dirtyDBs.join(CSL1(", "))));
dbIter=dirtyDBs.begin(); dbIter=dirtyDBs.begin();
} }
else else
@ -387,7 +387,7 @@ void InternalEditorAction::syncAppBlockChangedDB()
void InternalEditorAction::cleanup() void InternalEditorAction::cleanup()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fInternalEditorSyncStatus=eSyncFinished; fInternalEditorSynctqStatus=eSyncFinished;
emit syncDone(this); emit syncDone(this);
} }

@ -36,6 +36,7 @@
class InternalEditorAction : public SyncAction class InternalEditorAction : public SyncAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
InternalEditorAction(KPilotLink *); InternalEditorAction(KPilotLink *);
@ -56,13 +57,13 @@ private:
PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db); PilotRecord*localrec, PilotRecord*serialrec, PilotDatabase*db);
TQStringList dirtyDBs; TQStringList dirtyDBs;
TQStringList::Iterator dbIter; TQStringList::Iterator dbIter;
enum eInternalEditorSyncStatus { enum eInternalEditorSynctqStatus {
eSyncStarted, eSyncStarted,
eSyncDirtyDB, eSyncDirtyDB,
eSyncFlagsChangedDB, eSyncFlagsChangedDB,
eSyncAppBlockChangedDB, eSyncAppBlockChangedDB,
eSyncFinished eSyncFinished
} fInternalEditorSyncStatus; } fInternalEditorSynctqStatus;
} ; } ;
#endif #endif

@ -104,7 +104,7 @@ KPilotInstaller::KPilotInstaller() :
fQuitAfterCopyComplete(false), fQuitAfterCopyComplete(false),
fManagingWidget(0L), fManagingWidget(0L),
fDaemonWasRunning(true), fDaemonWasRunning(true),
fAppStatus(Startup), fApptqStatus(Startup),
fFileInstallWidget(0L), fFileInstallWidget(0L),
fLogWidget(0L) fLogWidget(0L)
{ {
@ -143,7 +143,7 @@ void KPilotInstaller::startDaemonIfNeeded()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fAppStatus=WaitingForDaemon; fApptqStatus=WaitingForDaemon;
TQString daemonError; TQString daemonError;
TQCString daemonDCOP; TQCString daemonDCOP;
@ -169,7 +169,7 @@ void KPilotInstaller::startDaemonIfNeeded()
if (!fDaemonWasRunning && KApplication::startServiceByDesktopName( if (!fDaemonWasRunning && KApplication::startServiceByDesktopName(
CSL1("kpilotdaemon"), CSL1("kpilotdaemon"),
TQString::null, &daemonError, &daemonDCOP, &daemonPID TQString(), &daemonError, &daemonDCOP, &daemonPID
, "0" /* no notify */ , "0" /* no notify */
)) ))
{ {
@ -178,9 +178,9 @@ void KPilotInstaller::startDaemonIfNeeded()
{ {
fLogWidget->addMessage(i18n("Could not start the " fLogWidget->addMessage(i18n("Could not start the "
"KPilot daemon. The system error message " "KPilot daemon. The system error message "
"was: &quot;%1&quot;").arg(daemonError)); "was: &quot;%1&quot;").tqarg(daemonError));
} }
fAppStatus=Error; fApptqStatus=Error;
} }
else else
{ {
@ -189,14 +189,14 @@ void KPilotInstaller::startDaemonIfNeeded()
{ {
int wordoffset; int wordoffset;
s.remove(0,12); s.remove(0,12);
wordoffset=s.find(';'); wordoffset=s.tqfind(';');
if (wordoffset>0) s.truncate(wordoffset); if (wordoffset>0) s.truncate(wordoffset);
fLogWidget->addMessage( fLogWidget->addMessage(
i18n("Daemon status is `%1'") i18n("Daemon status is `%1'")
.arg(s.isEmpty() ? i18n("not running") : s )); .tqarg(s.isEmpty() ? i18n("not running") : s ));
} }
fAppStatus=Normal; fApptqStatus=Normal;
} }
} }
@ -213,7 +213,7 @@ void KPilotInstaller::readConfig()
{ {
fLogWidget->addMessage(i18n("Using character set %1 on " fLogWidget->addMessage(i18n("Using character set %1 on "
"the handheld.") "the handheld.")
.arg(Pilot::codecName())); .tqarg(Pilot::codecName()));
} }
} }
@ -232,7 +232,7 @@ void KPilotInstaller::setupWidget()
fManagingWidget->show(); fManagingWidget->show();
setCentralWidget(fManagingWidget); setCentralWidget(fManagingWidget);
connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ), connect( fManagingWidget, TQT_SIGNAL( aboutToShowPage ( TQWidget* ) ),
this, TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) ); TQT_TQOBJECT(this), TQT_SLOT( slotAboutToShowComponent( TQWidget* ) ) );
initIcons(); initIcons();
initMenu(); initMenu();
@ -256,7 +256,7 @@ void KPilotInstaller::initComponents()
#define ADDICONPAGE(a,b) \ #define ADDICONPAGE(a,b) \
pixmap = KGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \ pixmap = KGlobal::iconLoader()->loadIcon(b, KIcon::Desktop, 64); \
w = getManagingWidget()->addVBoxPage(a,TQString::null, pixmap) ; w = getManagingWidget()->addVBoxPage(a,TQString(), pixmap) ;
ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync")); ADDICONPAGE(i18n("HotSync"),CSL1("kpilotbhotsync"));
fLogWidget = new LogWidget(w); fLogWidget = new LogWidget(w);
@ -320,21 +320,21 @@ void KPilotInstaller::slotSelectComponent(PilotComponent *c)
return; return;
} }
TQObject *o = c->parent(); TQObject *o = c->tqparent();
if (!o) if (!o)
{ {
WARNINGKPILOT << "Widget has no parent." << endl; WARNINGKPILOT << "Widget has no tqparent." << endl;
return; return;
} }
TQWidget *parent = dynamic_cast<TQWidget *>(o); TQWidget *tqparent = dynamic_cast<TQWidget *>(o);
if (!parent) if (!tqparent)
{ {
WARNINGKPILOT << "Widget's parent is not a widget." << endl; WARNINGKPILOT << "Widget's tqparent is not a widget." << endl;
return; return;
} }
int index = fManagingWidget->pageIndex(parent); int index = fManagingWidget->pageIndex(tqparent);
if (index < 0) if (index < 0)
{ {
@ -401,7 +401,7 @@ void KPilotInstaller::slotPCtoHHRequested()
i18n("Please press the HotSync button.")); i18n("Please press the HotSync button."));
} }
/* virtual DCOP */ ASYNC KPilotInstaller::daemonStatus(int i) /* virtual DCOP */ ASYNC KPilotInstaller::daemontqStatus(int i)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
DEBUGKPILOT << fname << ": Received daemon message " << i << endl; DEBUGKPILOT << fname << ": Received daemon message " << i << endl;
@ -409,17 +409,17 @@ void KPilotInstaller::slotPCtoHHRequested()
switch(i) switch(i)
{ {
case KPilotDCOP::StartOfHotSync : case KPilotDCOP::StartOfHotSync :
if (fAppStatus==Normal) if (fApptqStatus==Normal)
{ {
fAppStatus=WaitingForDaemon; fApptqStatus=WaitingForDaemon;
componentPreSync(); componentPreSync();
} }
break; break;
case KPilotDCOP::EndOfHotSync : case KPilotDCOP::EndOfHotSync :
if (fAppStatus==WaitingForDaemon) if (fApptqStatus==WaitingForDaemon)
{ {
componentPostSync(); componentPostSync();
fAppStatus=Normal; fApptqStatus=Normal;
} }
break; break;
case KPilotDCOP::DaemonQuit : case KPilotDCOP::DaemonQuit :
@ -429,7 +429,7 @@ void KPilotInstaller::slotPCtoHHRequested()
fLogWidget->logMessage(i18n("No further HotSyncs are possible.")); fLogWidget->logMessage(i18n("No further HotSyncs are possible."));
fLogWidget->logMessage(i18n("Restart the daemon to HotSync again.")); fLogWidget->logMessage(i18n("Restart the daemon to HotSync again."));
} }
fAppStatus=WaitingForDaemon; fApptqStatus=WaitingForDaemon;
break; break;
case KPilotDCOP::None : case KPilotDCOP::None :
WARNINGKPILOT << "Unhandled status message " << i << endl; WARNINGKPILOT << "Unhandled status message " << i << endl;
@ -437,7 +437,7 @@ void KPilotInstaller::slotPCtoHHRequested()
} }
} }
/* virtual DCOP*/ int KPilotInstaller::kpiloStatus() /* virtual DCOP*/ int KPilotInstaller::kpilotqStatus()
{ {
return status(); return status();
} }
@ -459,7 +459,7 @@ bool KPilotInstaller::componentPreSync()
if (!reason.isNull()) if (!reason.isNull())
{ {
KMessageBox::sorry(this, KMessageBox::sorry(this,
rprefix.arg(reason), rprefix.tqarg(reason),
i18n("Cannot start Sync")); i18n("Cannot start Sync"));
return false; return false;
} }
@ -519,11 +519,11 @@ void KPilotInstaller::initMenu()
"This applies only to the next HotSync; to change the default, use " "This applies only to the next HotSync; to change the default, use "
"the configuration dialog.")); "the configuration dialog."));
connect(syncPopup, TQT_SIGNAL(activated()), connect(syncPopup, TQT_SIGNAL(activated()),
this, TQT_SLOT(slotHotSyncRequested())); TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()));
// File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc // File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc
a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0, a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0,
this, TQT_SLOT(slotHotSyncRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()),
actionCollection(), "file_hotsync"); actionCollection(), "file_hotsync");
a->setToolTip(i18n("Next HotSync will be normal HotSync.")); a->setToolTip(i18n("Next HotSync will be normal HotSync."));
a->setWhatsThis(i18n("Tell the daemon that the next HotSync " a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@ -531,7 +531,7 @@ void KPilotInstaller::initMenu()
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0, a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0,
this, TQT_SLOT(slotFullSyncRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotFullSyncRequested()),
actionCollection(), "file_fullsync"); actionCollection(), "file_fullsync");
a->setToolTip(i18n("Next HotSync will be a FullSync.")); a->setToolTip(i18n("Next HotSync will be a FullSync."));
a->setWhatsThis(i18n("Tell the daemon that the next HotSync " a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@ -539,7 +539,7 @@ void KPilotInstaller::initMenu()
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("&Backup"), CSL1("backup"), 0, a = new KAction(i18n("&Backup"), CSL1("backup"), 0,
this, TQT_SLOT(slotBackupRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotBackupRequested()),
actionCollection(), "file_backup"); actionCollection(), "file_backup");
a->setToolTip(i18n("Next HotSync will be backup.")); a->setToolTip(i18n("Next HotSync will be backup."));
a->setWhatsThis(i18n("Tell the daemon that the next HotSync " a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@ -547,15 +547,15 @@ void KPilotInstaller::initMenu()
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("&Restore"), CSL1("restore"), 0, a = new KAction(i18n("&Restore"), CSL1("restore"), 0,
this, TQT_SLOT(slotRestoreRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotRestoreRequested()),
actionCollection(), "file_restore"); actionCollection(), "file_restore");
a->setToolTip(i18n("Next HotSync will be restore.")); a->setToolTip(i18n("Next HotSync will be restore."));
a->setWhatsThis(i18n("Tell the daemon that the next HotSync " a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
"should restore the Handheld from data on the PC.")); "should restore the Handheld from data on the PC."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("Copy Handheld to PC"), TQString::null, 0, a = new KAction(i18n("Copy Handheld to PC"), TQString(), 0,
this, TQT_SLOT(slotHHtoPCRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotHHtoPCRequested()),
actionCollection(), "file_HHtoPC"); actionCollection(), "file_HHtoPC");
a->setToolTip(i18n("Next HotSync will be backup.")); a->setToolTip(i18n("Next HotSync will be backup."));
a->setWhatsThis(i18n("Tell the daemon that the next HotSync " a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@ -563,8 +563,8 @@ void KPilotInstaller::initMenu()
"overwriting entries on the PC.")); "overwriting entries on the PC."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("Copy PC to Handheld"), TQString::null, 0, a = new KAction(i18n("Copy PC to Handheld"), TQString(), 0,
this, TQT_SLOT(slotPCtoHHRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotPCtoHHRequested()),
actionCollection(), "file_PCtoHH"); actionCollection(), "file_PCtoHH");
a->setToolTip(i18n("Next HotSync will copy PC to Handheld.")); a->setToolTip(i18n("Next HotSync will copy PC to Handheld."));
a->setWhatsThis(i18n("Tell the daemon that the next HotSync " a->setWhatsThis(i18n("Tell the daemon that the next HotSync "
@ -586,14 +586,14 @@ void KPilotInstaller::initMenu()
a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0, a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0,
this, TQT_SLOT(slotResetLink()), TQT_TQOBJECT(this), TQT_SLOT(slotResetLink()),
actionCollection(),"file_reload"); actionCollection(),"file_reload");
a->setToolTip(i18n("Reset the device connection.")); a->setToolTip(i18n("Reset the device connection."));
a->setWhatsThis(i18n("Try to reset the daemon and its connection " a->setWhatsThis(i18n("Try to reset the daemon and its connection "
"to the Handheld.")); "to the Handheld."));
a = KStdAction::quit(this, TQT_SLOT(quit()), actionCollection()); a = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon " a->setWhatsThis(i18n("Quit KPilot, (and stop the daemon "
"if configured that way).")); "if configured that way)."));
@ -603,15 +603,15 @@ void KPilotInstaller::initMenu()
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
(void) KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), (void) KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()),
actionCollection()); actionCollection());
(void) KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()),
actionCollection()); actionCollection());
(void) KStdAction::preferences(this, TQT_SLOT(configure()), (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()),
actionCollection()); actionCollection());
a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0, a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0,
this, TQT_SLOT(configureWizard()), TQT_TQOBJECT(this), TQT_SLOT(configureWizard()),
actionCollection(), "options_configure_wizard"); actionCollection(), "options_configure_wizard");
a->setWhatsThis(i18n("Configure KPilot using the configuration wizard.")); a->setWhatsThis(i18n("Configure KPilot using the configuration wizard."));
@ -685,13 +685,13 @@ void KPilotInstaller::addComponentPage(PilotComponent * p,
KToggleAction *pt = KToggleAction *pt =
new KToggleAction(name, /* "kpilot" -- component icon, */ 0, new KToggleAction(name, /* "kpilot" -- component icon, */ 0,
p, TQT_SLOT(slotShowComponent()), TQT_TQOBJECT(p), TQT_SLOT(slotShowComponent()),
actionCollection(), actionname); actionCollection(), actionname);
pt->setExclusiveGroup(CSL1("view_menu")); pt->setExclusiveGroup(CSL1("view_menu"));
connect(p, TQT_SIGNAL(showComponent(PilotComponent *)), connect(TQT_TQOBJECT(p), TQT_SIGNAL(showComponent(PilotComponent *)),
this, TQT_SLOT(slotSelectComponent(PilotComponent *))); TQT_TQOBJECT(this), TQT_SLOT(slotSelectComponent(PilotComponent *)));
} }
/* slot */ void KPilotInstaller::initializeComponents() /* slot */ void KPilotInstaller::initializeComponents()
@ -719,7 +719,7 @@ void KPilotInstaller::optionsConfigureToolbars()
// This was added in KDE 3.1 // This was added in KDE 3.1
saveMainWindowSettings( KGlobal::config(), autoSaveGroup() ); saveMainWindowSettings( KGlobal::config(), autoSaveGroup() );
KEditToolbar dlg(actionCollection()); KEditToolbar dlg(actionCollection());
connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(slotNewToolbarConfig()));
dlg.exec(); dlg.exec();
} }
@ -741,7 +741,7 @@ void KPilotInstaller::slotResetLink()
/* /*
** Can't be a member function because it needs to be called even with no KPilotInstaller. ** Can't be a member function because it needs to be called even with no KPilotInstaller.
*/ */
static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent) static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
bool ret = false; bool ret = false;
@ -754,7 +754,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
KPilotSettings::self()->readConfig(); KPilotSettings::self()->readConfig();
KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), parent, "KPilotPreferences", true ); KCMultiDialog *options = new KCMultiDialog( KDialogBase::Plain, i18n("Configuration"), tqparent, "KPilotPreferences", true );
options->addModule( CSL1("kpilot_config.desktop") ); options->addModule( CSL1("kpilot_config.desktop") );
if (!options) if (!options)
@ -796,7 +796,7 @@ static bool runConfigure(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
* canceled, though). * canceled, though).
*/ */
typedef enum { Failed, OK, Cancel } WizardResult; typedef enum { Failed, OK, Cancel } WizardResult;
static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent) static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *tqparent)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
WizardResult ret = Failed ; WizardResult ret = Failed ;
@ -826,7 +826,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
goto sorry; goto sorry;
} }
w = f(parent,ConfigWizard::Standalone); w = f(tqparent,ConfigWizard::Standalone);
if (!w) if (!w)
{ {
WARNINGKPILOT << "Can't create wizard." << endl; WARNINGKPILOT << "Can't create wizard." << endl;
@ -847,7 +847,7 @@ static WizardResult runWizard(PilotDaemonDCOP_stub &daemon,TQWidget *parent)
sorry: sorry:
if (Failed == ret) if (Failed == ret)
{ {
KMessageBox::sorry(parent, KMessageBox::sorry(tqparent,
i18n("The library containing the configuration wizard for KPilot " i18n("The library containing the configuration wizard for KPilot "
"could not be loaded, and the wizard is not available. " "could not be loaded, and the wizard is not available. "
"Please try to use the regular configuration dialog."), "Please try to use the regular configuration dialog."),
@ -896,7 +896,7 @@ void KPilotInstaller::componentUpdate()
if (fLogWidget) if (fLogWidget)
{ {
fLogWidget->logMessage(i18n("Changed username to `%1'.") fLogWidget->logMessage(i18n("Changed username to `%1'.")
.arg(KPilotSettings::userName())); .tqarg(KPilotSettings::userName()));
fManagingWidget->showPage(0); fManagingWidget->showPage(0);
slotAboutToShowComponent(fLogWidget); slotAboutToShowComponent(fLogWidget);
} }
@ -920,7 +920,7 @@ void KPilotInstaller::componentUpdate()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse ) if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse )
{ {
if (fLogWidget) if (fLogWidget)
{ {
@ -928,7 +928,7 @@ void KPilotInstaller::componentUpdate()
} }
return; return;
} }
fAppStatus=UIBusy; fApptqStatus=UIBusy;
fConfigureKPilotDialogInUse = true; fConfigureKPilotDialogInUse = true;
if (runWizard(getDaemon(),this) == OK) if (runWizard(getDaemon(),this) == OK)
@ -937,14 +937,14 @@ void KPilotInstaller::componentUpdate()
} }
fConfigureKPilotDialogInUse = false; fConfigureKPilotDialogInUse = false;
fAppStatus=Normal; fApptqStatus=Normal;
} }
/* virtual DCOP */ ASYNC KPilotInstaller::configure() /* virtual DCOP */ ASYNC KPilotInstaller::configure()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if ( fAppStatus!=Normal || fConfigureKPilotDialogInUse ) if ( fApptqStatus!=Normal || fConfigureKPilotDialogInUse )
{ {
if (fLogWidget) if (fLogWidget)
{ {
@ -952,7 +952,7 @@ void KPilotInstaller::componentUpdate()
} }
return; return;
} }
fAppStatus=UIBusy; fApptqStatus=UIBusy;
fConfigureKPilotDialogInUse = true; fConfigureKPilotDialogInUse = true;
if (runConfigure(getDaemon(),this)) if (runConfigure(getDaemon(),this))
{ {
@ -960,7 +960,7 @@ void KPilotInstaller::componentUpdate()
} }
fConfigureKPilotDialogInUse = false; fConfigureKPilotDialogInUse = false;
fAppStatus=Normal; fApptqStatus=Normal;
} }

@ -43,14 +43,14 @@ class PilotComponent;
class FileInstallWidget; class FileInstallWidget;
class LogWidget; class LogWidget;
#include "kpilotDCOP.h" #include "kpilotDCOP.h"
class KPilotInstaller : public KMainWindow, public KPilotDCOP class KPilotInstaller : public KMainWindow, public KPilotDCOP
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
KPilotInstaller(); KPilotInstaller();
@ -70,7 +70,7 @@ public:
void addComponentPage(PilotComponent *, const TQString &name); void addComponentPage(PilotComponent *, const TQString &name);
KPiloStatus status() const { return fAppStatus; } ; KPilotqStatus status() const { return fApptqStatus; } ;
protected: protected:
@ -122,16 +122,25 @@ public:
/** /**
* This is the DCOP interface from the daemon to KPilot. * This is the DCOP interface from the daemon to KPilot.
*/ */
virtual ASYNC daemonStatus(int); virtual ASYNC daemontqStatus(int);
virtual int kpiloStatus(); virtual int kpilotqStatus();
public slots: public slots:
/** /**
* This is the DCOP interface from the daemon to KPilot * This is the DCOP interface from the daemon to KPilot
* to configure KPilot. * to configure KPilot.
*/ */
// MOC_SKIP_BEGIN
#ifdef Q_MOC_RUN
virtual void configure();
virtual void configureWizard();
#else // Q_MOC_RUN
// MOC_SKIP_END
virtual ASYNC configure(); virtual ASYNC configure();
virtual ASYNC configureWizard(); virtual ASYNC configureWizard();
// MOC_SKIP_BEGIN
#endif // Q_MOC_RUN
// MOC_SKIP_END
protected: protected:
void readConfig(); void readConfig();
@ -166,7 +175,7 @@ private:
KJanusWidget *fManagingWidget; KJanusWidget *fManagingWidget;
bool fDaemonWasRunning; bool fDaemonWasRunning;
KPiloStatus fAppStatus; KPilotqStatus fApptqStatus;
FileInstallWidget *fFileInstallWidget; FileInstallWidget *fFileInstallWidget;
LogWidget *fLogWidget; LogWidget *fLogWidget;

@ -163,7 +163,7 @@ void KPilotConfig::addFlagsChangedDatabase(TQString db)
s += i18n("The configuration file is outdated."); s += i18n("The configuration file is outdated.");
s += ' '; s += ' ';
s += i18n("The configuration file has version %1, while KPilot " s += i18n("The configuration file has version %1, while KPilot "
"needs version %2.").arg(fileversion).arg(ConfigurationVersion); "needs version %2.").tqarg(fileversion).tqarg(ConfigurationVersion);
if (run) if (run)
{ {
s += ' '; s += ' ';
@ -209,7 +209,7 @@ static void update440()
TQStringList conduits( KPilotSettings::installedConduits() ); TQStringList conduits( KPilotSettings::installedConduits() );
KConfig*c = KPilotSettings::self()->config(); KConfig*c = KPilotSettings::self()->config();
/// c->resetGroup(); /// c->resetGroup();
c->setGroup( TQString::null ); c->setGroup( TQString() );
bool installFiles = c->readBoolEntry("SyncFiles",true); bool installFiles = c->readBoolEntry("SyncFiles",true);
if (installFiles) conduits.append( CSL1("internal_fileinstall") ); if (installFiles) conduits.append( CSL1("internal_fileinstall") );
c->deleteEntry("SyncFiles"); c->deleteEntry("SyncFiles");
@ -234,7 +234,7 @@ static void update440()
const char **s = oldconduits; const char **s = oldconduits;
while (*s) while (*s)
{ {
TQString libname = CSL1("kde3/lib%1conduit.so").arg(TQString::tqfromLatin1(*s)); TQString libname = CSL1("kde3/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
TQString foundlib = ::locate("lib",libname); TQString foundlib = ::locate("lib",libname);
if (!foundlib.isEmpty()) if (!foundlib.isEmpty())
{ {
@ -270,7 +270,7 @@ static void update443()
{ {
if ((*i).length()==4) if ((*i).length()==4)
{ {
fixSkip.append(CSL1("[%1]").arg(*i)); fixSkip.append(CSL1("[%1]").tqarg(*i));
fixedSome = true; fixedSome = true;
} }
else else

@ -66,7 +66,7 @@
/* virtual */ TQString ConfigPage::maybeSaveText() const /* virtual */ TQString ConfigPage::maybeSaveText() const
{ {
return i18n("<qt>The settings for configuration page <i>%1</i> have been changed. Do you " return i18n("<qt>The settings for configuration page <i>%1</i> have been changed. Do you "
"want to save the changes before continuing?</qt>").arg(this->conduitName()); "want to save the changes before continuing?</qt>").tqarg(this->conduitName());
} }
DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n ) DeviceConfigPage::DeviceConfigPage(TQWidget * w, const char *n ) : ConfigPage( w, n )
@ -146,7 +146,7 @@ void DeviceConfigPage::load()
"is longer than 13 characters. This is " "is longer than 13 characters. This is "
"probably unsupported and can cause problems. " "probably unsupported and can cause problems. "
"Are you sure you want to use this device name?</qt>") "Are you sure you want to use this device name?</qt>")
.arg(d), .tqarg(d),
i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use") i18n("Device Name too Long"), i18n("Use"), i18n("Do Not Use")
) ; ) ;
} }

@ -53,6 +53,7 @@ protected:
class DeviceConfigPage : public ConfigPage class DeviceConfigPage : public ConfigPage
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
DeviceConfigPage( TQWidget *, const char * ); DeviceConfigPage( TQWidget *, const char * );
@ -90,6 +91,7 @@ private:
class BackupConfigPage : public ConfigPage class BackupConfigPage : public ConfigPage
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
BackupConfigPage( TQWidget *, const char * ); BackupConfigPage( TQWidget *, const char * );

@ -2,7 +2,7 @@
<class>BackupConfigWidget</class> <class>BackupConfigWidget</class>
<comment>A widget for editing HotSync-specific settings.</comment> <comment>A widget for editing HotSync-specific settings.</comment>
<author>David Bishop</author> <author>David Bishop</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>BackupConfigForm</cstring> <cstring>BackupConfigForm</cstring>
</property> </property>
@ -21,7 +21,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>GroupBox23_2</cstring> <cstring>GroupBox23_2</cstring>
</property> </property>
@ -32,7 +32,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>TextLabel5_2</cstring> <cstring>TextLabel5_2</cstring>
</property> </property>
@ -57,7 +57,7 @@
<cstring>fBackupFrequency</cstring> <cstring>fBackupFrequency</cstring>
</property> </property>
</widget> </widget>
<widget class="QComboBox"> <widget class="TQComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>On every HotSync</string> <string>On every HotSync</string>
@ -82,7 +82,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>GroupBox23</cstring> <cstring>GroupBox23</cstring>
</property> </property>
@ -93,7 +93,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel5</cstring> <cstring>TextLabel5</cstring>
</property> </property>
@ -113,7 +113,7 @@
<string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel6</cstring> <cstring>TextLabel6</cstring>
</property> </property>
@ -133,7 +133,7 @@
<string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="0" column="1"> <widget class="TQLineEdit" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fBackupOnly</cstring> <cstring>fBackupOnly</cstring>
</property> </property>
@ -141,7 +141,7 @@
<string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the backup operation here. Use this setting if backing up some databases crashes the handheld, or if you do not want a backup of some databases (like AvantGo pages).&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="1" column="1"> <widget class="TQLineEdit" row="1" column="1">
<property name="name"> <property name="name">
<cstring>fSkipDB</cstring> <cstring>fSkipDB</cstring>
</property> </property>
@ -149,7 +149,7 @@
<string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string> <string>&lt;qt&gt;&lt;p&gt;Enter the databases types you wish to exclude from the restore operation here (like AvantGo databases). They will be skipped even if they exist in the set of backup databases on the handheld. If you still want to install an ignored database to the handheld, you can always manually install it to the handheld.&lt;/p&gt;&lt;p&gt;Entries with square brackets [] are &lt;i&gt;creator codes&lt;/i&gt; like &lt;tt&gt;[lnch]&lt;/tt&gt; and can exclude a whole range of databases. Entries without the brackets list database names, and may include shell-style wildcards, like &lt;tt&gt;*_a68k&lt;/tt&gt;.&lt;/p&gt;&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="0" column="2"> <widget class="TQPushButton" row="0" column="2">
<property name="name"> <property name="name">
<cstring>fBackupOnlyChooser</cstring> <cstring>fBackupOnlyChooser</cstring>
</property> </property>
@ -160,7 +160,7 @@
<string>&lt;qt&gt;Click here to open the database selection dialog. This dialog allows you to check the databases you want to exclude from the backup from a list.&lt;/qt&gt;</string> <string>&lt;qt&gt;Click here to open the database selection dialog. This dialog allows you to check the databases you want to exclude from the backup from a list.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="1" column="2"> <widget class="TQPushButton" row="1" column="2">
<property name="name"> <property name="name">
<cstring>fSkipDBChooser</cstring> <cstring>fSkipDBChooser</cstring>
</property> </property>
@ -173,7 +173,7 @@
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>fRunConduitsWithBackup</cstring> <cstring>fRunConduitsWithBackup</cstring>
</property> </property>

@ -2,7 +2,7 @@
<class>DeviceConfigWidget</class> <class>DeviceConfigWidget</class>
<comment>A widget for configuring the hardware device.</comment> <comment>A widget for configuring the hardware device.</comment>
<author>David Bishop</author> <author>David Bishop</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>DeviceForm</cstring> <cstring>DeviceForm</cstring>
</property> </property>
@ -21,7 +21,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel1</cstring> <cstring>TextLabel1</cstring>
</property> </property>
@ -35,7 +35,7 @@
<string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fPilotDevice</cstring> <cstring>fPilotDevice</cstring>
</property> </property>
@ -43,7 +43,7 @@
<string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel4</cstring> <cstring>TextLabel4</cstring>
</property> </property>
@ -57,7 +57,7 @@
<string>&lt;qt&gt;Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.&lt;/qt&gt;</string>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fUserName</cstring> <cstring>fUserName</cstring>
</property> </property>
@ -82,7 +82,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QComboBox" row="1" column="1"> <widget class="TQComboBox" row="1" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>9600</string> <string>9600</string>
@ -115,7 +115,7 @@
<string>&lt;qt&gt;Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select the speed of the serial connection to your handheld here. This has no meaning for USB devices. For an older model, choose 9600. Newer models may be able to handle speeds up to the maximum listed, 115200. You can experiment with the connection speed: the manual suggests starting at a speed of 19200 and trying faster speeds to see if they work.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -129,7 +129,7 @@
<string>&lt;qt&gt;PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.&lt;/qt&gt;</string> <string>&lt;qt&gt;PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
<property name="name"> <property name="name">
<cstring>TextLabel2</cstring> <cstring>TextLabel2</cstring>
</property> </property>
@ -143,7 +143,7 @@
<string>&lt;qt&gt;Enter your name here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter your name here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="3" column="1" rowspan="1" colspan="2"> <widget class="TQComboBox" row="3" column="1" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fPilotEncoding</cstring> <cstring>fPilotEncoding</cstring>
</property> </property>
@ -154,7 +154,7 @@
<string>&lt;qt&gt;PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.&lt;/qt&gt;</string> <string>&lt;qt&gt;PalmOS devices are available in many different languages. If your device uses a different encoding than ISO-latin1 (ISO8859-1), select the correct encoding here, in order to display special characters correctly.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="0"> <widget class="TQLabel" row="2" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_2</cstring> <cstring>textLabel1_2</cstring>
</property> </property>
@ -165,7 +165,7 @@
<cstring>fWorkaround</cstring> <cstring>fWorkaround</cstring>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="2" column="1" rowspan="1" colspan="2"> <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="2">
<item> <item>
<property name="text"> <property name="text">
<string>None</string> <string>None</string>

@ -3,7 +3,7 @@
<comment>A tabWidget for configuring <comment>A tabWidget for configuring
KPilot's settings.</comment> KPilot's settings.</comment>
<author>David Bishop</author> <author>David Bishop</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>StartExitForm</cstring> <cstring>StartExitForm</cstring>
</property> </property>
@ -25,7 +25,7 @@ KPilot's settings.</comment>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QGroupBox" row="1" column="0"> <widget class="TQGroupBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>groupBox4</cstring> <cstring>groupBox4</cstring>
</property> </property>
@ -36,7 +36,7 @@ KPilot's settings.</comment>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fKillDaemonOnExit</cstring> <cstring>fKillDaemonOnExit</cstring>
</property> </property>
@ -47,7 +47,7 @@ KPilot's settings.</comment>
<string>&lt;qt&gt;Check this box to stop the KPilot daemon when you quit KPilot (only if KPilot started the daemon itself).&lt;/qt&gt;</string> <string>&lt;qt&gt;Check this box to stop the KPilot daemon when you quit KPilot (only if KPilot started the daemon itself).&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fQuitAfterSync</cstring> <cstring>fQuitAfterSync</cstring>
</property> </property>
@ -60,7 +60,7 @@ KPilot's settings.</comment>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox" row="0" column="0"> <widget class="TQGroupBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>GroupBox1_2</cstring> <cstring>GroupBox1_2</cstring>
</property> </property>
@ -71,7 +71,7 @@ KPilot's settings.</comment>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox" row="0" column="0"> <widget class="TQCheckBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fStartDaemonAtLogin</cstring> <cstring>fStartDaemonAtLogin</cstring>
</property> </property>
@ -82,7 +82,7 @@ KPilot's settings.</comment>
<string>&lt;qt&gt;Check this box to start up the KPilot daemon every time you log in to KDE.&lt;/qt&gt;</string> <string>&lt;qt&gt;Check this box to start up the KPilot daemon every time you log in to KDE.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="1" column="0"> <widget class="TQCheckBox" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fDockDaemon</cstring> <cstring>fDockDaemon</cstring>
</property> </property>

@ -2,7 +2,7 @@
<class>SyncConfigWidget</class> <class>SyncConfigWidget</class>
<comment>A widget for editing HotSync-specific settings.</comment> <comment>A widget for editing HotSync-specific settings.</comment>
<author>David Bishop</author> <author>David Bishop</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>SyncConfigForm</cstring> <cstring>SyncConfigForm</cstring>
</property> </property>
@ -24,7 +24,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QCheckBox" row="1" column="1"> <widget class="TQCheckBox" row="1" column="1">
<property name="name"> <property name="name">
<cstring>fFullSyncCheck</cstring> <cstring>fFullSyncCheck</cstring>
</property> </property>
@ -38,7 +38,7 @@
<string>&lt;qt&gt;Check this box to perform a full sync when your last sync was performed with another PC or system, to guarantee the completeness of your data.&lt;/qt&gt;</string> <string>&lt;qt&gt;Check this box to perform a full sync when your last sync was performed with another PC or system, to guarantee the completeness of your data.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="0" column="1"> <widget class="TQComboBox" row="0" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>HotSync (sync all changes)</string> <string>HotSync (sync all changes)</string>
@ -66,7 +66,7 @@
<string>&lt;qt&gt;Select in this list the synchronization type that KPilot will use as default. Possible values are:&lt;br&gt;"HotSync", to run all selected conduits, and sync the databases with a modified flag set, updating the modified records only;&lt;br&gt;"FullSync" to run all selected conduits, and sync all databases, reading all records, and performing a full backup;&lt;br&gt;"Copy PC to handheld" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the PC data to the handheld;&lt;br&gt;"Copy handheld to PC" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the handheld data to the PC.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select in this list the synchronization type that KPilot will use as default. Possible values are:&lt;br&gt;"HotSync", to run all selected conduits, and sync the databases with a modified flag set, updating the modified records only;&lt;br&gt;"FullSync" to run all selected conduits, and sync all databases, reading all records, and performing a full backup;&lt;br&gt;"Copy PC to handheld" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the PC data to the handheld;&lt;br&gt;"Copy handheld to PC" to run all conduits and sync all databases, but instead of merging the information from both sources, copy the handheld data to the PC.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1_2</cstring> <cstring>textLabel1_2</cstring>
</property> </property>
@ -94,7 +94,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="QComboBox" row="3" column="1"> <widget class="TQComboBox" row="3" column="1">
<item> <item>
<property name="text"> <property name="text">
<string>Ask User</string> <string>Ask User</string>
@ -132,7 +132,7 @@
<string>&lt;qt&gt;Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "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. Note that the conflict resolution option selected here can be overridden by conduits that have their own conflict resolution configuration.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select in this list how conflicting entries (entries which were edited both on your handheld and on the PC) are resolved. Possibly values are "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. Note that the conflict resolution option selected here can be overridden by conduits that have their own conflict resolution configuration.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="3" column="0"> <widget class="TQLabel" row="3" column="0">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -151,7 +151,7 @@
<cstring>fConflictResolution</cstring> <cstring>fConflictResolution</cstring>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="2" column="1"> <widget class="TQCheckBox" row="2" column="1">
<property name="name"> <property name="name">
<cstring>fScreenlockSecure</cstring> <cstring>fScreenlockSecure</cstring>
</property> </property>

@ -3,7 +3,7 @@
<comment>A tabWidget for configuring <comment>A tabWidget for configuring
KPilot's settings.</comment> KPilot's settings.</comment>
<author>David Bishop</author> <author>David Bishop</author>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>ViewersForm</cstring> <cstring>ViewersForm</cstring>
</property> </property>
@ -25,7 +25,7 @@ KPilot's settings.</comment>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>groupBox2</cstring> <cstring>groupBox2</cstring>
</property> </property>
@ -36,7 +36,7 @@ KPilot's settings.</comment>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>fInternalEditors</cstring> <cstring>fInternalEditors</cstring>
</property> </property>
@ -53,7 +53,7 @@ KPilot's settings.</comment>
<string>&lt;qt&gt;The internal viewers can be read only or editable. The editable mode allows you to add new records, delete or edit the existing records and sync your modifications back to the handheld. Check this box to set the internal viewers to editable mode, uncheck to set them to read only mode.&lt;/qt&gt;</string> <string>&lt;qt&gt;The internal viewers can be read only or editable. The editable mode allows you to add new records, delete or edit the existing records and sync your modifications back to the handheld. Check this box to set the internal viewers to editable mode, uncheck to set them to read only mode.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>fUseSecret</cstring> <cstring>fUseSecret</cstring>
</property> </property>
@ -66,7 +66,7 @@ KPilot's settings.</comment>
</widget> </widget>
</vbox> </vbox>
</widget> </widget>
<widget class="QButtonGroup"> <widget class="TQButtonGroup">
<property name="name"> <property name="name">
<cstring>fAddressGroup</cstring> <cstring>fAddressGroup</cstring>
</property> </property>
@ -77,7 +77,7 @@ KPilot's settings.</comment>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QRadioButton" row="0" column="0"> <widget class="TQRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fNormalDisplay</cstring> <cstring>fNormalDisplay</cstring>
</property> </property>
@ -88,7 +88,7 @@ KPilot's settings.</comment>
<string>&lt;qt&gt;Select this option to display addresses in the internal address viewer sorted by last name, first name.&lt;/qt&gt;</string> <string>&lt;qt&gt;Select this option to display addresses in the internal address viewer sorted by last name, first name.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton" row="1" column="0"> <widget class="TQRadioButton" row="1" column="0">
<property name="name"> <property name="name">
<cstring>fCompanyDisplay</cstring> <cstring>fCompanyDisplay</cstring>
</property> </property>
@ -113,7 +113,7 @@ KPilot's settings.</comment>
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="3" column="0"> <widget class="TQCheckBox" row="3" column="0">
<property name="name"> <property name="name">
<cstring>fUseKeyField</cstring> <cstring>fUseKeyField</cstring>
</property> </property>

@ -52,8 +52,8 @@
#include "kpilotProbeDialog.h" #include "kpilotProbeDialog.h"
ConfigWizard::ConfigWizard(TQWidget *parent, const char *n, int m) : ConfigWizard::ConfigWizard(TQWidget *tqparent, const char *n, int m) :
KWizard(parent, n), KWizard(tqparent, n),
fMode((Mode)m) fMode((Mode)m)
{ {
// page1=new ConfigWizard_base1(this); // page1=new ConfigWizard_base1(this);
@ -197,7 +197,7 @@ void ConfigWizard::accept()
KPilotSettings::setInstalledConduits( conduits ); KPilotSettings::setInstalledConduits( conduits );
#undef APPEND_CONDUIT #undef APPEND_CONDUIT
TQString finishMessage = i18n("KPilot is now configured to sync with %1.").arg(applicationName); TQString finishMessage = i18n("KPilot is now configured to sync with %1.").tqarg(applicationName);
if (fMode == InDialog) if (fMode == InDialog)
{ {
finishMessage.append(CSL1("\n")); finishMessage.append(CSL1("\n"));

@ -37,6 +37,7 @@ class ConfigWizard_base3;
class ConfigWizard : public KWizard class ConfigWizard : public KWizard
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
enum Mode { InDialog=0, Standalone=1 } ; enum Mode { InDialog=0, Standalone=1 } ;

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>ConfigWizard_base3</class> <class>ConfigWizard_base3</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>ConfigWizard_base3</cstring> <cstring>ConfigWizard_base3</cstring>
</property> </property>
@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel6</cstring> <cstring>textLabel6</cstring>
</property> </property>
@ -29,7 +29,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="QButtonGroup" row="2" column="0"> <widget class="TQButtonGroup" row="2" column="0">
<property name="name"> <property name="name">
<cstring>fAppType</cstring> <cstring>fAppType</cstring>
</property> </property>
@ -40,7 +40,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QRadioButton"> <widget class="TQRadioButton">
<property name="name"> <property name="name">
<cstring>radioButton6</cstring> <cstring>radioButton6</cstring>
</property> </property>
@ -51,7 +51,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="TQRadioButton">
<property name="name"> <property name="name">
<cstring>radioButton8</cstring> <cstring>radioButton8</cstring>
</property> </property>
@ -59,7 +59,7 @@ Press "Finish" to setup KPilot according to the settings in this configuration W
<string>&amp;GNOME-PIM (Evolution)</string> <string>&amp;GNOME-PIM (Evolution)</string>
</property> </property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="TQRadioButton">
<property name="name"> <property name="name">
<cstring>radioButton4</cstring> <cstring>radioButton4</cstring>
</property> </property>

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>ConfigWizard_base2</class> <class>ConfigWizard_base2</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>ConfigWizard_base2</cstring> <cstring>ConfigWizard_base2</cstring>
</property> </property>
@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel1</cstring> <cstring>textLabel1</cstring>
</property> </property>
@ -27,7 +27,7 @@
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="QLabel"> <widget class="TQLabel">
<property name="name"> <property name="name">
<cstring>textLabel5</cstring> <cstring>textLabel5</cstring>
</property> </property>
@ -38,7 +38,7 @@
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
<widget class="QGroupBox"> <widget class="TQGroupBox">
<property name="name"> <property name="name">
<cstring>groupBox2</cstring> <cstring>groupBox2</cstring>
</property> </property>
@ -65,7 +65,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="1" column="0"> <widget class="TQLabel" row="1" column="0">
<property name="name"> <property name="name">
<cstring>textLabel3_2</cstring> <cstring>textLabel3_2</cstring>
</property> </property>
@ -79,7 +79,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
<string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QPushButton" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fProbeButton</cstring> <cstring>fProbeButton</cstring>
</property> </property>
@ -90,7 +90,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
<string>&lt;qt&gt;Click this button to open the detection dialog. The wizard will try to automatically find and display the correct device and username for your handheld. If the wizard cannot retrieve this information, check if you have write permission for the device.&lt;/qt&gt;</string> <string>&lt;qt&gt;Click this button to open the detection dialog. The wizard will try to automatically find and display the correct device and username for your handheld. If the wizard cannot retrieve this information, check if you have write permission for the device.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="1" column="1"> <widget class="TQLineEdit" row="1" column="1">
<property name="name"> <property name="name">
<cstring>fDeviceName</cstring> <cstring>fDeviceName</cstring>
</property> </property>
@ -101,7 +101,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
<string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter the device the Pilot is attached to (for instance a serial or USB port) here. You can also use &lt;i&gt;/dev/pilot&lt;/i&gt;, and make that a symlink to the correct device. Use the button below to automatically detect the device. You need write permission to successfully synchronize with the handheld.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" row="0" column="1"> <widget class="TQLineEdit" row="0" column="1">
<property name="name"> <property name="name">
<cstring>fUserName</cstring> <cstring>fUserName</cstring>
</property> </property>
@ -109,7 +109,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
<string>&lt;qt&gt;Enter your username here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting, or use the button below to automatically detect it.&lt;/qt&gt;</string> <string>&lt;qt&gt;Enter your username here, as it appears in the Pilot's &amp;quot;Owner&amp;quot; setting, or use the button below to automatically detect it.&lt;/qt&gt;</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>textLabel2_2</cstring> <cstring>textLabel2_2</cstring>
</property> </property>
@ -125,7 +125,7 @@ Network: This has not been tested by any of the KPilot developers themselves (ha
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QCheckBox"> <widget class="TQCheckBox">
<property name="name"> <property name="name">
<cstring>fPilotRunningPermanently</cstring> <cstring>fPilotRunningPermanently</cstring>
</property> </property>

@ -43,7 +43,7 @@ public:
StartOfHotSync=1, StartOfHotSync=1,
EndOfHotSync=2, EndOfHotSync=2,
DaemonQuit=4 } ; DaemonQuit=4 } ;
enum KPiloStatus { enum KPilotqStatus {
Startup=1, Startup=1,
WaitingForDaemon=2, WaitingForDaemon=2,
Normal=10, Normal=10,
@ -55,7 +55,7 @@ k_dcop:
* This is the method the daemon uses to report * This is the method the daemon uses to report
* changes in its state. * changes in its state.
*/ */
virtual ASYNC daemonStatus(int) = 0; virtual ASYNC daemontqStatus(int) = 0;
/** /**
* This is the method the daemon uses to popup * This is the method the daemon uses to popup
@ -67,7 +67,7 @@ k_dcop:
/** /**
* Report KPilot's state back to the daemon. * Report KPilot's state back to the daemon.
*/ */
virtual int kpiloStatus() = 0; virtual int kpilotqStatus() = 0;
} ; } ;

@ -86,8 +86,8 @@ and the module can't be unloaded.
*/ */
ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) : ProbeDialog::ProbeDialog(TQWidget *tqparent, const char *n) :
KDialogBase(parent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")), KDialogBase(tqparent, n, true, i18n("Autodetecting Your Handheld"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::User1, KDialogBase::Cancel, true, i18n("Restart Detection")),
mDetected(false), mUserName(), mDevice() mDetected(false), mUserName(), mDevice()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -97,13 +97,13 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
fInfoText = new TQLabel( i18n( "KPilot is now trying to automatically detect the device of your handheld. Please press the hotsync button if you have not done so already." ), mainWidget, "fInfoText" ); fInfoText = new TQLabel( i18n( "KPilot is now trying to automatically detect the device of your handheld. Please press the hotsync button if you have not done so already." ), mainWidget, "fInfoText" );
fInfoText->tqsetAlignment( TQLabel::WordBreak ); fInfoText->tqsetAlignment( TQLabel::WordBreak );
fStatusGroup = new TQGroupBox( i18n("Status"), mainWidget, "fStatusGroup" ); fStatusGroup = new TQGroupBox( i18n("tqStatus"), mainWidget, "fStatusGroup" );
fStatusGroup->setColumnLayout(0, Qt::Vertical ); fStatusGroup->setColumnLayout(0, Qt::Vertical );
fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() ); fStatusGroupLayout = new TQGridLayout( fStatusGroup->tqlayout() );
fStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "fStatus" ); ftqStatus = new TQLabel( i18n("Autodetection not yet started..."), fStatusGroup, "ftqStatus" );
fStatus->tqsetAlignment( TQLabel::WordBreak ); ftqStatus->tqsetAlignment( TQLabel::WordBreak );
fStatusGroupLayout->addWidget( fStatus, 0, 0 ); fStatusGroupLayout->addWidget( ftqStatus, 0, 0 );
fProgress = new KProgress( 100, fStatusGroup, "fProgress" ); fProgress = new KProgress( 100, fStatusGroup, "fProgress" );
fStatusGroupLayout->addWidget( fProgress, 1, 0 ); fStatusGroupLayout->addWidget( fProgress, 1, 0 );
@ -114,7 +114,7 @@ ProbeDialog::ProbeDialog(TQWidget *parent, const char *n) :
fResultsGroup->setEnabled( FALSE ); fResultsGroup->setEnabled( FALSE );
fResultsGroup->setColumnLayout(0, Qt::Vertical ); fResultsGroup->setColumnLayout(0, Qt::Vertical );
fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() ); fResultsGroupLayout = new TQGridLayout( fResultsGroup->tqlayout() );
fResultsGroupLayout->tqsetAlignment( Qt::AlignTop ); fResultsGroupLayout->tqsetAlignment( TQt::AlignTop );
fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" ); fUserLabel = new TQLabel( i18n( "Handheld user:" ), fResultsGroup, "fUserLabel" );
fUserLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) ); fUserLabel->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, fUserLabel->sizePolicy().hasHeightForWidth() ) );
@ -192,7 +192,7 @@ void ProbeDialog::startDetection()
disconnectDevices(); disconnectDevices();
fProgress->setProgress(0); fProgress->setProgress(0);
fStatus->setText( i18n("Starting detection...") ); ftqStatus->setText( i18n("Starting detection...") );
TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) ); TQTimer::singleShot(0, this, TQT_SLOT(processEvents()) );
processEvents(); processEvents();
PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface"); PilotDaemonDCOP_stub *daemonStub = new PilotDaemonDCOP_stub("kpilotDaemon", "KPilotDaemonIface");
@ -230,7 +230,7 @@ void ProbeDialog::startDetection()
processEvents(); processEvents();
} }
} }
fStatus->setText( i18n("Waiting for handheld to connect...") ); ftqStatus->setText( i18n("Waiting for handheld to connect...") );
mProbeDevicesIndex=0; mProbeDevicesIndex=0;
detect(); detect();
@ -263,7 +263,7 @@ void ProbeDialog::timeout()
{ {
disconnectDevices(); disconnectDevices();
if (!mDetected) { if (!mDetected) {
fStatus->setText( i18n("Timeout reached, could not detect a handheld.") ); ftqStatus->setText( i18n("Timeout reached, could not detect a handheld.") );
KMessageBox::information ( this, i18n("<qt>A handheld could not be detected. Possible check the following things:</p>" KMessageBox::information ( this, i18n("<qt>A handheld could not be detected. Possible check the following things:</p>"
"<ul><li> Have you pressed the hotsync button on the handheld?\n" "<ul><li> Have you pressed the hotsync button on the handheld?\n"
"<li> Make sure the device sits in the cradle correctly.\n" "<li> Make sure the device sits in the cradle correctly.\n"
@ -285,7 +285,7 @@ void ProbeDialog::connection( KPilotDeviceLink*lnk)
mUserName = usr.name(); mUserName = usr.name();
mDevice = mActiveLink->pilotPath(); mDevice = mActiveLink->pilotPath();
fStatus->setText( i18n("Found a connected device on %1").arg(mDevice) ); ftqStatus->setText( i18n("Found a connected device on %1").tqarg(mDevice) );
fUser->setText( mUserName ); fUser->setText( mUserName );
fDevice->setText( mDevice ); fDevice->setText( mDevice );
mDetected = true; mDetected = true;
@ -335,7 +335,7 @@ void ProbeDialog::disconnectDevices()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if (!mDetected) fStatus->setText( i18n("Disconnected from all devices") ); if (!mDetected) ftqStatus->setText( i18n("Disconnected from all devices") );
fProcessEventsTimer->stop( ); fProcessEventsTimer->stop( );
fTimeoutTimer->stop(); fTimeoutTimer->stop();
fProgressTimer->stop(); fProgressTimer->stop();

@ -46,6 +46,7 @@ typedef TQMap<TQString, KPilotDeviceLink*> PilotLinkMap;
class ProbeDialog : public KDialogBase class ProbeDialog : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ProbeDialog(TQWidget *p=0L,const char *n=0L); ProbeDialog(TQWidget *p=0L,const char *n=0L);
~ProbeDialog(); ~ProbeDialog();
@ -77,7 +78,7 @@ protected:
TQLabel* fUser; TQLabel* fUser;
TQLabel* fDevice; TQLabel* fDevice;
TQGroupBox* fStatusGroup; TQGroupBox* fStatusGroup;
TQLabel* fStatus; TQLabel* ftqStatus;
KProgress* fProgress; KProgress* fProgress;
TQTimer* fProcessEventsTimer; TQTimer* fProcessEventsTimer;

@ -271,7 +271,7 @@ void KroupwareSync::end_syncNotesWithKMail()
int pid; int pid;
return KApplication::startServiceByDesktopName(CSL1("kmail"), return KApplication::startServiceByDesktopName(CSL1("kmail"),
TQString::null, TQString(),
error, error,
&kmdcop, &kmdcop,
&pid &pid

@ -36,9 +36,9 @@
#include "listCat.moc" #include "listCat.moc"
ListCategorizer::ListCategorizer(TQWidget * parent, ListCategorizer::ListCategorizer(TQWidget * tqparent,
const char *name) : const char *name) :
KListView(parent, name), KListView(tqparent, name),
fStartOpen(false) fStartOpen(false)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -47,9 +47,9 @@ ListCategorizer::ListCategorizer(TQWidget * parent,
ListCategorizer::ListCategorizer(const TQStringList & i, ListCategorizer::ListCategorizer(const TQStringList & i,
bool startOpen, bool startOpen,
TQWidget * parent, TQWidget * tqparent,
const char *name) : const char *name) :
KListView(parent, name), KListView(tqparent, name),
fStartOpen(startOpen) fStartOpen(startOpen)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -121,7 +121,7 @@ void ListCategorizer::setupWidget()
return; return;
} }
TQListViewItem *category = p->parent(); TQListViewItem *category = p->tqparent();
if (!category) if (!category)
{ {
@ -136,7 +136,7 @@ void ListCategorizer::setupWidget()
FUNCTIONSETUP; FUNCTIONSETUP;
TQListViewItem *p = currentItem(); TQListViewItem *p = currentItem();
if (!p || !p->parent()) if (!p || !p->tqparent())
return; return;
KListView::startDrag(); KListView::startDrag();
@ -194,7 +194,7 @@ RichListViewItem::RichListViewItem(TQListViewItem *p,
fColumns=c; fColumns=c;
fIsRich = new bool[c]; fIsRich = new bool[c];
fRect = new QRect[c]; fRect = new TQRect[c];
for (int i=0; i<c; i++) for (int i=0; i<c; i++)
{ {

@ -64,6 +64,7 @@ class TQStringList;
class ListCategorizer : public KListView class ListCategorizer : public KListView
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** /**
@ -71,9 +72,9 @@ public:
* *
* This creates a new empty ListCategorizer with * This creates a new empty ListCategorizer with
* startOpen set to false. The parameters * startOpen set to false. The parameters
* @p parent and @p name are the usual Qt ones. * @p tqparent and @p name are the usual TQt ones.
*/ */
ListCategorizer(TQWidget *parent, ListCategorizer(TQWidget *tqparent,
const char *name = 0); const char *name = 0);
/** /**
* Constructor. * Constructor.
@ -84,7 +85,7 @@ public:
*/ */
ListCategorizer(const TQStringList& categories, ListCategorizer(const TQStringList& categories,
bool startOpen, bool startOpen,
TQWidget *parent, TQWidget *tqparent,
const char *name = 0); const char *name = 0);
/** /**
@ -103,7 +104,7 @@ public:
* @return the TQListViewItem created for the category * @return the TQListViewItem created for the category
*/ */
TQListViewItem *addCategory(const TQString& name, TQListViewItem *addCategory(const TQString& name,
const TQString& description = TQString::null); const TQString& description = TQString());
/** /**
* Returns the list of names of the categories in * Returns the list of names of the categories in
* the ListCategorizer. * the ListCategorizer.
@ -117,13 +118,13 @@ public:
* Add a single item to the category named @p category, * Add a single item to the category named @p category,
* with name @p name and description set to @p description. * with name @p name and description set to @p description.
* This might be a convenience function, but it's probably * This might be a convenience function, but it's probably
* more convenient to just use QListViewItem's * more convenient to just use TQListViewItem's
* constructor. That way you can also hide more data in * constructor. That way you can also hide more data in
* the remaining columns. * the remaining columns.
*/ */
TQListViewItem *addItem(const TQString& category, TQListViewItem *addItem(const TQString& category,
const TQString& name, const TQString& name,
const TQString& description = TQString::null); const TQString& description = TQString());
/** /**
* Returns the list of strings in column @p column under * Returns the list of strings in column @p column under
* category @p category. You can do this to get, for example * category @p category. You can do this to get, for example
@ -138,7 +139,7 @@ public:
} }
/** /**
* Given a category categoryName return the QListViewItem * Given a category categoryName return the TQListViewItem
* that represents that category. Probably a useless function, * that represents that category. Probably a useless function,
* since just remembering the pointer addCategory gives * since just remembering the pointer addCategory gives
* you is faster and uses hardly any memory. * you is faster and uses hardly any memory.
@ -197,10 +198,10 @@ private:
} ; } ;
class RichListViewItem : public QListViewItem class RichListViewItem : public TQListViewItem
{ {
public: public:
RichListViewItem(TQListViewItem *parent, RichListViewItem(TQListViewItem *tqparent,
TQString, TQString,
int); int);
virtual ~RichListViewItem(); virtual ~RichListViewItem();

@ -94,8 +94,8 @@ PilotListItem::~PilotListItem()
} }
#endif #endif
PilotCheckListItem::PilotCheckListItem(TQListView * parent, const TQString & text, recordid_t pilotid, void *r) : PilotCheckListItem::PilotCheckListItem(TQListView * tqparent, const TQString & text, recordid_t pilotid, void *r) :
TQCheckListItem(parent, text, TQCheckListItem::CheckBox), TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),
fid(pilotid), fid(pilotid),
fr(r) fr(r)
{ {
@ -142,11 +142,11 @@ void PilotCheckListItem::stateChange ( bool on)
} }
#endif #endif
PilotListViewItem::PilotListViewItem( TQListView * parent, PilotListViewItem::PilotListViewItem( TQListView * tqparent,
TQString label1, TQString label2, TQString label3, TQString label4, TQString label1, TQString label2, TQString label3, TQString label4,
recordid_t pilotid, void *r): recordid_t pilotid, void *r):
TQListViewItem(parent, label1, label2, label3, label4, TQListViewItem(tqparent, label1, label2, label3, label4,
TQString::null, TQString::null, TQString::null, TQString::null), TQString(), TQString(), TQString(), TQString()),
fid(pilotid), fid(pilotid),
fr(r), fr(r),
d(new PilotListViewItemData) d(new PilotListViewItemData)

@ -35,7 +35,7 @@
#include <tqlistview.h> #include <tqlistview.h>
#include <pi-dlp.h> #include <pi-dlp.h>
class PilotListItem : public QListBoxText class PilotListItem : public TQListBoxText
{ {
public: public:
PilotListItem(const TQString &text, recordid_t pilotid=0, void *r=0); PilotListItem(const TQString &text, recordid_t pilotid=0, void *r=0);
@ -56,10 +56,10 @@ private:
#endif #endif
}; };
class PilotCheckListItem : public QCheckListItem class PilotCheckListItem : public TQCheckListItem
{ {
public: public:
PilotCheckListItem( TQListView * parent, const TQString & text, recordid_t pilotid=0, void *r=0); PilotCheckListItem( TQListView * tqparent, const TQString & text, recordid_t pilotid=0, void *r=0);
virtual ~PilotCheckListItem(); virtual ~PilotCheckListItem();
recordid_t id() const {return fid;}; recordid_t id() const {return fid;};
const void *rec() const {return fr;}; const void *rec() const {return fr;};
@ -82,12 +82,12 @@ struct PilotListViewItemData
unsigned long val; unsigned long val;
}; };
class PilotListViewItem : public QListViewItem class PilotListViewItem : public TQListViewItem
{ {
public: public:
PilotListViewItem( TQListView * parent, PilotListViewItem( TQListView * tqparent,
TQString label1, TQString label2 = TQString::null, TQString label1, TQString label2 = TQString(),
TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label3 = TQString(), TQString label4 = TQString(),
recordid_t pilotid=0, void *r=0); recordid_t pilotid=0, void *r=0);
virtual ~PilotListViewItem(); virtual ~PilotListViewItem();
recordid_t id() const {return fid;}; recordid_t id() const {return fid;};

@ -68,23 +68,23 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing(
} }
fSyncing = true; fSyncing = true;
fLogStream.setDevice(fOutfile); fLogStream.setDevice(TQT_TQIODEVICE(fOutfile));
fLogStream<<(CSL1("KPilot HotSync log, %1").arg(TQDateTime::tqcurrentDateTime().toString()))<<endl<<endl<<endl; fLogStream<<(CSL1("KPilot HotSync log, %1").tqarg(TQDateTime::tqcurrentDateTime().toString()))<<endl<<endl<<endl;
fLogStream<<(CSL1("Version: KPilot %1").arg(TQString::tqfromLatin1(KPILOT_VERSION)))<<endl; fLogStream<<(CSL1("Version: KPilot %1").tqarg(TQString::tqfromLatin1(KPILOT_VERSION)))<<endl;
fLogStream<<(CSL1("Version: pilot-link %1.%2.%3%4" ) fLogStream<<(CSL1("Version: pilot-link %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 #ifdef PILOT_LINK_PATCH
.arg(TQString::tqfromLatin1(PILOT_LINK_PATCH)) .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH))
#else #else
.arg(TQString()) .tqarg(TQString())
#endif #endif
)<<endl; )<<endl;
#ifdef KDE_VERSION_STRING #ifdef KDE_VERSION_STRING
fLogStream<<(CSL1("Version: KDE %1" ).arg(TQString::tqfromLatin1(KDE_VERSION_STRING)) )<<endl; fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::tqfromLatin1(KDE_VERSION_STRING)) )<<endl;
#endif #endif
#ifdef QT_VERSION_STR #ifdef TQT_VERSION_STR
fLogStream<<(CSL1("Version: Qt %1" ).arg(TQString::tqfromLatin1(QT_VERSION_STR)) )<<endl; fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)) )<<endl;
#endif #endif
fLogStream<<endl<<endl; fLogStream<<endl<<endl;

@ -39,6 +39,7 @@ class TQTextStream;
class LogFile : public TQObject, public LoggerDCOP class LogFile : public TQObject, public LoggerDCOP
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
LogFile(); LogFile();

@ -56,16 +56,12 @@
#include "logWidget.moc" #include "logWidget.moc"
#if QT_VERSION < 0x030100
#define TE_EOL "<br/>"
#else
#define TE_EOL "\n" #define TE_EOL "\n"
#endif
LogWidget::LogWidget(TQWidget * parent) : LogWidget::LogWidget(TQWidget * tqparent) :
DCOPObject("LogIface"), DCOPObject("LogIface"),
PilotComponent(parent, "component_log", TQString::null), PilotComponent(tqparent, "component_log", TQString()),
fLog(0L), fLog(0L),
fShowTime(false), fShowTime(false),
fSplash(0L), fSplash(0L),
@ -89,11 +85,7 @@ LogWidget::LogWidget(TQWidget * parent) :
fLog->setReadOnly(true); fLog->setReadOnly(true);
fLog->setWordWrap(TQTextEdit::WidgetWidth); fLog->setWordWrap(TQTextEdit::WidgetWidth);
fLog->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary); fLog->setWrapPolicy(TQTextEdit::AtWordOrDocumentBoundary);
#if QT_VERSION < 0x030100 fLog->setTextFormat(TQt::LogText);
/* nothing, use AutoText */
#else
fLog->setTextFormat(Qt::LogText);
#endif
TQWhatsThis::add(fLog, i18n("<qt>This lists all the messages received " TQWhatsThis::add(fLog, i18n("<qt>This lists all the messages received "
"during the current HotSync</qt>")); "during the current HotSync</qt>"));
@ -103,24 +95,24 @@ LogWidget::LogWidget(TQWidget * parent) :
TQString initialText ; TQString initialText ;
initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL) initialText.append(CSL1("<b>Version:</b> KPilot %1" TE_EOL)
.arg(TQString::tqfromLatin1(KPILOT_VERSION))); .tqarg(TQString::tqfromLatin1(KPILOT_VERSION)));
initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL) initialText.append(CSL1("<b>Version:</b> pilot-link %1.%2.%3%4" TE_EOL)
.arg(PILOT_LINK_VERSION) .tqarg(PILOT_LINK_VERSION)
.arg(PILOT_LINK_MAJOR) .tqarg(PILOT_LINK_MAJOR)
.arg(PILOT_LINK_MINOR) .tqarg(PILOT_LINK_MINOR)
#ifdef PILOT_LINK_PATCH #ifdef PILOT_LINK_PATCH
.arg(TQString::tqfromLatin1(PILOT_LINK_PATCH)) .tqarg(TQString::tqfromLatin1(PILOT_LINK_PATCH))
#else #else
.arg(TQString()) .tqarg(TQString())
#endif #endif
); );
#ifdef KDE_VERSION_STRING #ifdef KDE_VERSION_STRING
initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL) initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL)
.arg(TQString::tqfromLatin1(KDE_VERSION_STRING))); .tqarg(TQString::tqfromLatin1(KDE_VERSION_STRING)));
#endif #endif
#ifdef QT_VERSION_STR #ifdef TQT_VERSION_STR
initialText.append(CSL1("<b>Version:</b> Qt %1" TE_EOL) initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL)
.arg(TQString::tqfromLatin1(QT_VERSION_STR))); .tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)));
#endif #endif
initialText.append(CSL1(TE_EOL)); initialText.append(CSL1(TE_EOL));
@ -228,12 +220,7 @@ void LogWidget::addMessage(const TQString & s)
t.append(s); t.append(s);
#if QT_VERSION < 0x030100
t.append(TE_EOL);
fLog->setText(fLog->text() + t);
#else
fLog->append(t); fLog->append(t);
#endif
fLog->scrollToBottom(); fLog->scrollToBottom();
} }
@ -328,7 +315,7 @@ void LogWidget::hideSplash()
if (fLog) if (fLog)
{ {
fLog->setText(TQString::null); fLog->setText(TQString());
} }
} }
@ -341,7 +328,7 @@ void LogWidget::hideSplash()
while (!finished) while (!finished)
{ {
TQString saveFileName = KFileDialog::getSaveFileName( TQString saveFileName = KFileDialog::getSaveFileName(
TQString::null, /* default */ TQString(), /* default */
CSL1("*.log"), /* show log files by default */ CSL1("*.log"), /* show log files by default */
this, this,
i18n("Save Log")); i18n("Save Log"));

@ -40,6 +40,7 @@ class KProgress;
class LogWidget : public PilotComponent , public LoggerDCOP class LogWidget : public PilotComponent , public LoggerDCOP
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
LogWidget(TQWidget *); LogWidget(TQWidget *);

@ -74,9 +74,9 @@ public:
} ; } ;
MemoWidget::MemoWidget(TQWidget * parent, MemoWidget::MemoWidget(TQWidget * tqparent,
const TQString & path) : const TQString & path) :
PilotComponent(parent, "component_memo", path), PilotComponent(tqparent, "component_memo", path),
fTextWidget(0L), fTextWidget(0L),
d(new Private()), d(new Private()),
lastSelectedMemo(-1) lastSelectedMemo(-1)
@ -84,7 +84,7 @@ MemoWidget::MemoWidget(TQWidget * parent,
FUNCTIONSETUP; FUNCTIONSETUP;
setGeometry(0, 0, setGeometry(0, 0,
parent->tqgeometry().width(), parent->tqgeometry().height()); tqparent->tqgeometry().width(), tqparent->tqgeometry().height());
setupWidget(); setupWidget();
d->fMemoList.setAutoDelete(true); d->fMemoList.setAutoDelete(true);
slotUpdateButtons(); slotUpdateButtons();
@ -255,7 +255,7 @@ void MemoWidget::setupWidget()
fTextWidget = new KTextEdit(this, "textArea"); fTextWidget = new KTextEdit(this, "textArea");
fTextWidget->setWordWrap(KTextEdit::WidgetWidth); fTextWidget->setWordWrap(KTextEdit::WidgetWidth);
fTextWidget->setTextFormat(Qt::PlainText); fTextWidget->setTextFormat(TQt::PlainText);
grid->addMultiCellWidget(fTextWidget, 1, 4, 2, 2); grid->addMultiCellWidget(fTextWidget, 1, 4, 2, 2);
TQWhatsThis::add(fTextWidget, TQWhatsThis::add(fTextWidget,
i18n("The text of the selected memo appears here.")); i18n("The text of the selected memo appears here."));
@ -640,7 +640,7 @@ void MemoWidget::slotExportMemo()
const TQString filter = CSL1("*|Plain text output\n*.xml|XML output"); const TQString filter = CSL1("*|Plain text output\n*.xml|XML output");
TQString fileName; TQString fileName;
KFileDialog kfile( TQString::null , filter, fExportButton , "memoSave" , true ); KFileDialog kfile( TQString() , filter, fExportButton , "memoSave" , true );
kfile.setOperationMode( KFileDialog::Saving ); kfile.setOperationMode( KFileDialog::Saving );
if ( kfile.exec() == TQDialog::Accepted ) { if ( kfile.exec() == TQDialog::Accepted ) {
@ -720,7 +720,7 @@ bool MemoWidget::saveAsXML(const TQString &fileName,const TQPtrList<PilotListIte
{ {
// //
// //
//Only if QDom can read the .xml file and set the doc object to be populated with it's contents //Only if TQDom can read the .xml file and set the doc object to be populated with it's contents
memos = doc.documentElement(); memos = doc.documentElement();
if ( memos.tagName()!= CSL1("memos") ) if ( memos.tagName()!= CSL1("memos") )
{ {

@ -42,9 +42,10 @@ class PilotListItem;
class MemoWidget : public PilotComponent class MemoWidget : public PilotComponent
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
MemoWidget(TQWidget* parent, const TQString& dbpath); MemoWidget(TQWidget* tqparent, const TQString& dbpath);
virtual ~MemoWidget(); virtual ~MemoWidget();
// Pilot Component Methods: // Pilot Component Methods:

@ -46,19 +46,19 @@
#include "pilotComponent.moc" #include "pilotComponent.moc"
PilotComponent::PilotComponent(TQWidget * parent, PilotComponent::PilotComponent(TQWidget * tqparent,
const char *id, const char *id,
const TQString & path) : const TQString & path) :
TQWidget(parent, id), TQWidget(tqparent, id),
fDBPath(path), fDBPath(path),
shown(false) shown(false)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if (parent) if (tqparent)
{ {
resize(parent->tqgeometry().width(), resize(tqparent->tqgeometry().width(),
parent->tqgeometry().height()); tqparent->tqgeometry().height());
} }
} }

@ -38,13 +38,14 @@ struct CategoryAppInfo;
class TQComboBox; class TQComboBox;
class TQString; class TQString;
class PilotComponent : public QWidget class PilotComponent : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
friend class KPilotInstaller; friend class KPilotInstaller;
public: public:
PilotComponent(TQWidget* parent, PilotComponent(TQWidget* tqparent,
const char *id, const char *id,
const TQString& dbPath); const TQString& dbPath);
@ -81,7 +82,7 @@ public:
* stating the reason why into @p s. This string will be * stating the reason why into @p s. This string will be
* displayed to the user: * displayed to the user:
* "Can't start HotSync. %1" * "Can't start HotSync. %1"
* where %1 is tqreplaced by s. * where %1 is replaced by s.
*/ */
virtual bool preHotSync(TQString &s) ; virtual bool preHotSync(TQString &s) ;

@ -119,14 +119,14 @@ PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) :
switch (e->button()) switch (e->button())
{ {
case RightButton: case Qt::RightButton:
{ {
KPopupMenu *menu = contextMenu(); KPopupMenu *menu = contextMenu();
contextMenuAboutToShow(menu); contextMenuAboutToShow(menu);
menu->popup(e->globalPos()); menu->popup(e->globalPos());
} }
break; break;
case LeftButton: case Qt::LeftButton:
if (daemon) daemon->slotRunKPilot(); if (daemon) daemon->slotRunKPilot();
break; break;
default: default:
@ -166,7 +166,7 @@ void PilotDaemonTray::setupWidget()
SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \ SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \
(int)(SyncAction::SyncMode::a)); (int)(SyncAction::SyncMode::a));
fSyncTypeMenu->insertItem(i18n("Default (%1)") fSyncTypeMenu->insertItem(i18n("Default (%1)")
.arg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())), .tqarg(SyncAction::SyncMode::name((SyncAction::SyncMode::Mode)KPilotSettings::syncType())),
0); 0);
fSyncTypeMenu->insertSeparator(); fSyncTypeMenu->insertSeparator();
@ -279,7 +279,7 @@ void PilotDaemonTray::endHotSync()
PilotDaemon::PilotDaemon() : PilotDaemon::PilotDaemon() :
DCOPObject("KPilotDaemonIface"), DCOPObject("KPilotDaemonIface"),
fDaemonStatus(INIT), fDaemontqStatus(INIT),
fPostSyncAction(None), fPostSyncAction(None),
fPilotLink(0L), fPilotLink(0L),
fNextSyncType(SyncAction::SyncMode::eHotSync,true), fNextSyncType(SyncAction::SyncMode::eHotSync,true),
@ -290,14 +290,14 @@ PilotDaemon::PilotDaemon() :
fLogStub(new LoggerDCOP_stub("kpilot", "LogIface")), fLogStub(new LoggerDCOP_stub("kpilot", "LogIface")),
fLogFileStub(new LoggerDCOP_stub("kpilotDaemon", "LogIface")), fLogFileStub(new LoggerDCOP_stub("kpilotDaemon", "LogIface")),
fKPilotStub(new KPilotDCOP_stub("kpilot", "KPilotIface")), fKPilotStub(new KPilotDCOP_stub("kpilot", "KPilotIface")),
fTempDevice(TQString::null) fTempDevice(TQString())
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
setupPilotLink(); setupPilotLink();
reloadSettings(); reloadSettings();
if (fDaemonStatus == ERROR) if (fDaemontqStatus == ERROR)
{ {
WARNINGKPILOT << "Connecting to device failed." << endl; WARNINGKPILOT << "Connecting to device failed." << endl;
return; return;
@ -313,7 +313,7 @@ PilotDaemon::PilotDaemon() :
#ifdef DEBUG #ifdef DEBUG
DEBUGKPILOT << fname DEBUGKPILOT << fname
<< ": The daemon is ready with status " << ": The daemon is ready with status "
<< statusString() << " (" << (int) fDaemonStatus << ")" << endl; << statusString() << " (" << (int) fDaemontqStatus << ")" << endl;
#endif #endif
} }
@ -403,7 +403,7 @@ void PilotDaemon::showTray()
DEBUGKPILOT << fname << ": Tray icon displayed." << endl; DEBUGKPILOT << fname << ": Tray icon displayed." << endl;
#endif #endif
updateTrayStatus(); updateTraytqStatus();
} }
/* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d) /* DCOP ASYNC */ void PilotDaemon::setTempDevice(TQString d)
@ -420,7 +420,7 @@ void PilotDaemon::showTray()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
switch (fDaemonStatus) switch (fDaemontqStatus)
{ {
case INIT: case INIT:
case HOTSYNC_END: case HOTSYNC_END:
@ -508,15 +508,15 @@ void PilotDaemon::showTray()
} }
} }
updateTrayStatus(); updateTraytqStatus();
logProgress(TQString::null,0); logProgress(TQString(),0);
} }
/* DCOP */ void PilotDaemon::stopListening() /* DCOP */ void PilotDaemon::stopListening()
{ {
fIsListening=false; fIsListening=false;
fTray->changeIcon(PilotDaemonTray::NotListening); fTray->changeIcon(PilotDaemonTray::NotListening);
fDaemonStatus=NOT_LISTENING; fDaemontqStatus=NOT_LISTENING;
fPilotLink->close(); fPilotLink->close();
} }
@ -524,7 +524,7 @@ void PilotDaemon::showTray()
{ {
fIsListening=true; fIsListening=true;
fTray->changeIcon(PilotDaemonTray::Normal); fTray->changeIcon(PilotDaemonTray::Normal);
fDaemonStatus=INIT; fDaemontqStatus=INIT;
fPilotLink->reset(); fPilotLink->reset();
} }
@ -616,13 +616,13 @@ bool PilotDaemon::setupPilotLink()
// Using switch to make sure we cover all the cases. // Using switch to make sure we cover all the cases.
// //
// //
switch (fDaemonStatus) switch (fDaemontqStatus)
{ {
case INIT: case INIT:
case HOTSYNC_END: case HOTSYNC_END:
case ERROR: case ERROR:
case NOT_LISTENING: case NOT_LISTENING:
getKPilot().daemonStatus(KPilotDCOP::DaemonQuit); getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
kapp->quit(); kapp->quit();
break; break;
case READY: case READY:
@ -655,7 +655,7 @@ bool PilotDaemon::setupPilotLink()
return; return;
} }
updateTrayStatus(); updateTraytqStatus();
if (fTray && (fTray->fSyncTypeMenu)) if (fTray && (fTray->fSyncTypeMenu))
{ {
@ -667,7 +667,7 @@ bool PilotDaemon::setupPilotLink()
} }
} }
getLogger().logMessage(i18n("Next HotSync will be: %1. ").arg(fNextSyncType.name()) + getLogger().logMessage(i18n("Next HotSync will be: %1. ").tqarg(fNextSyncType.name()) +
i18n("Please press the HotSync button.")); i18n("Please press the HotSync button."));
} }
@ -731,7 +731,7 @@ static void fillConduitNameMap()
TQStringList l = KPilotSettings::installedConduits(); TQStringList l = KPilotSettings::installedConduits();
// Fill with internal settings. // Fill with internal settings.
if ( l.find( CSL1("internal_fileinstall") ) != l.end() ) { if ( l.tqfind( CSL1("internal_fileinstall") ) != l.end() ) {
conduitNameMap->insert( CSL1("internal_fileinstall"), conduitNameMap->insert( CSL1("internal_fileinstall"),
new TQString(i18n("File Installer")) ); new TQString(i18n("File Installer")) );
} }
@ -739,7 +739,7 @@ static void fillConduitNameMap()
TQStringList::ConstIterator end = l.end(); TQStringList::ConstIterator end = l.end();
for (TQStringList::ConstIterator i = l.begin(); i != end; ++i) for (TQStringList::ConstIterator i = l.begin(); i != end; ++i)
{ {
if (!conduitNameMap->find(*i)) if (!conduitNameMap->tqfind(*i))
{ {
TQString readableName = CSL1("<unknown>"); TQString readableName = CSL1("<unknown>");
KSharedPtr < KService > o = KService::serviceByDesktopName(*i); KSharedPtr < KService > o = KService::serviceByDesktopName(*i);
@ -774,7 +774,7 @@ TQStringList PilotDaemon::configuredConduitList()
TQStringList result; TQStringList result;
for (TQStringList::ConstIterator i = keys.begin(); i != end; ++i) for (TQStringList::ConstIterator i = keys.begin(); i != end; ++i)
{ {
result << *(conduitNameMap->find(*i)); result << *(conduitNameMap->tqfind(*i));
} }
return result; return result;
@ -799,8 +799,8 @@ bool PilotDaemon::killDaemonOnExit()
return KPilotSettings::killDaemonAtExit(); return KPilotSettings::killDaemonAtExit();
} }
typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLockStatus; typedef enum { NotLocked=0, Locked=1, DCOPError=2 } KDesktopLocktqStatus;
static KDesktopLockStatus isKDesktopLockRunning() static KDesktopLocktqStatus isKDesktopLockRunning()
{ {
if (!KPilotSettings::screenlockSecure()) return NotLocked; if (!KPilotSettings::screenlockSecure()) return NotLocked;
@ -847,7 +847,7 @@ static void informOthers(KPilotDCOP_stub &kpilot,
LoggerDCOP_stub &log, LoggerDCOP_stub &log,
LoggerDCOP_stub &filelog) LoggerDCOP_stub &filelog)
{ {
kpilot.daemonStatus(KPilotDCOP::StartOfHotSync); kpilot.daemontqStatus(KPilotDCOP::StartOfHotSync);
log.logStartSync(); log.logStartSync();
filelog.logStartSync(); filelog.logStartSync();
} }
@ -864,7 +864,7 @@ static bool isSyncPossible(ActionQueue *fSyncStack,
* just tell the user that the sync couldn't run because * just tell the user that the sync couldn't run because
* of that. * of that.
*/ */
int kpilotstatus = kpilot.kpiloStatus(); int kpilotstatus = kpilot.kpilotqStatus();
DCOPStub::Status callstatus = kpilot.status(); DCOPStub::Status callstatus = kpilot.status();
#ifdef DEBUG #ifdef DEBUG
@ -920,7 +920,7 @@ static void queueInstaller(ActionQueue *fSyncStack,
FileInstaller *fInstaller, FileInstaller *fInstaller,
const TQStringList &c) const TQStringList &c)
{ {
if (c.findIndex(CSL1("internal_fileinstall")) >= 0) if (c.tqfindIndex(CSL1("internal_fileinstall")) >= 0)
{ {
fSyncStack->addAction(new FileInstallAction(pilotLink,fInstaller->dir())); fSyncStack->addAction(new FileInstallAction(pilotLink,fInstaller->dir()));
} }
@ -999,11 +999,11 @@ bool PilotDaemon::shouldBackup()
DEBUGKPILOT << fname DEBUGKPILOT << fname
<< ": Starting Sync with type " << ": Starting Sync with type "
<< fNextSyncType.name() << endl; << fNextSyncType.name() << endl;
DEBUGKPILOT << fname << ": Status is " << shorStatusString() << endl; DEBUGKPILOT << fname << ": tqStatus is " << shorStatusString() << endl;
(void) PilotDatabase::instanceCount(); (void) PilotDatabase::instanceCount();
#endif #endif
fDaemonStatus = HOTSYNC_START ; fDaemontqStatus = HOTSYNC_START ;
if (fTray) if (fTray)
{ {
fTray->startHotSync(); fTray->startHotSync();
@ -1120,7 +1120,7 @@ launch:
TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit())); TQTimer::singleShot(0,fSyncStack,TQT_SLOT(execConduit()));
updateTrayStatus(); updateTraytqStatus();
} }
/* slot */ void PilotDaemon::logMessage(const TQString & s) /* slot */ void PilotDaemon::logMessage(const TQString & s)
@ -1129,7 +1129,7 @@ launch:
getLogger().logMessage(s); getLogger().logMessage(s);
getFileLogger().logMessage(s); getFileLogger().logMessage(s);
updateTrayStatus(s); updateTraytqStatus(s);
} }
/* slot */ void PilotDaemon::logError(const TQString & s) /* slot */ void PilotDaemon::logError(const TQString & s)
@ -1138,7 +1138,7 @@ launch:
getLogger().logError(s); getLogger().logError(s);
getFileLogger().logError(s); getFileLogger().logError(s);
updateTrayStatus(s); updateTraytqStatus(s);
} }
/* slot */ void PilotDaemon::logProgress(const TQString & s, int i) /* slot */ void PilotDaemon::logProgress(const TQString & s, int i)
@ -1147,7 +1147,7 @@ launch:
getLogger().logProgress(s, i); getLogger().logProgress(s, i);
getFileLogger().logProgress(s, i); getFileLogger().logProgress(s, i);
if (!s.isEmpty()) updateTrayStatus(s); if (!s.isEmpty()) updateTraytqStatus(s);
} }
/* slot */ void PilotDaemon::endHotSync() /* slot */ void PilotDaemon::endHotSync()
@ -1166,15 +1166,15 @@ launch:
getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100); getFileLogger().logProgress(i18n("HotSync Completed.<br>"), 100);
getLogger().logEndSync(); getLogger().logEndSync();
getFileLogger().logEndSync(); getFileLogger().logEndSync();
getKPilot().daemonStatus(KPilotDCOP::EndOfHotSync); getKPilot().daemontqStatus(KPilotDCOP::EndOfHotSync);
KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime()); KPilotSettings::setLastSyncTime(TQDateTime::tqcurrentDateTime());
KPilotSettings::self()->writeConfig(); KPilotSettings::self()->writeConfig();
fDaemonStatus = HOTSYNC_END; fDaemontqStatus = HOTSYNC_END;
if (fPostSyncAction & Quit) if (fPostSyncAction & Quit)
{ {
getKPilot().daemonStatus(KPilotDCOP::DaemonQuit); getKPilot().daemontqStatus(KPilotDCOP::DaemonQuit);
kapp->quit(); kapp->quit();
} }
if (fPostSyncAction & ReloadSettings) if (fPostSyncAction & ReloadSettings)
@ -1191,7 +1191,7 @@ launch:
(void) PilotDatabase::instanceCount(); (void) PilotDatabase::instanceCount();
updateTrayStatus(); updateTraytqStatus();
} }
@ -1209,7 +1209,7 @@ void PilotDaemon::slotRunKPilot()
int kpilotPID; int kpilotPID;
if (KApplication::startServiceByDesktopName(CSL1("kpilot"), if (KApplication::startServiceByDesktopName(CSL1("kpilot"),
TQString::null, &kpilotError, &kpilotDCOP, &kpilotPID TQString(), &kpilotError, &kpilotDCOP, &kpilotPID
#if (KDE_VERSION >= 220) #if (KDE_VERSION >= 220)
// Startup notification added in 2.2 // Startup notification added in 2.2
, "" , ""
@ -1251,8 +1251,8 @@ void PilotDaemon::slotRunConfig()
if ( client->isApplicationRegistered( "kpilot" ) ) if ( client->isApplicationRegistered( "kpilot" ) )
{ {
client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString::null); client->send("kpilot", "kpilot-mainwindow#1", "raise()",TQString());
client->send("kpilot", "KPilotIface", "configure()", TQString::null); client->send("kpilot", "KPilotIface", "configure()", TQString());
} }
else else
{ {
@ -1264,7 +1264,7 @@ void PilotDaemon::slotRunConfig()
} }
} }
void PilotDaemon::updateTrayStatus(const TQString &s) void PilotDaemon::updateTraytqStatus(const TQString &s)
{ {
if (!fTray) return; if (!fTray) return;
@ -1272,7 +1272,7 @@ void PilotDaemon::updateTrayStatus(const TQString &s)
tipText.append( s ); tipText.append( s );
tipText.append( CSL1(" ") ); tipText.append( CSL1(" ") );
tipText.append( i18n("Next sync is %1.") tipText.append( i18n("Next sync is %1.")
.arg( fNextSyncType.name() ) ); .tqarg( fNextSyncType.name() ) );
tipText.append( CSL1("</qt>") ); tipText.append( CSL1("</qt>") );
TQToolTip::remove(fTray); TQToolTip::remove(fTray);

@ -54,6 +54,7 @@ class KPilotDeviceLink;
class PilotDaemonTray : public KSystemTray class PilotDaemonTray : public KSystemTray
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
friend class PilotDaemon; friend class PilotDaemon;
@ -126,7 +127,8 @@ private:
class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP class PilotDaemon : public TQObject, virtual public PilotDaemonDCOP
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
// The tray must be our friend so that we can let it stop the daemon. // The tray must be our friend so that we can let it stop the daemon.
friend class PilotDaemonTray; friend class PilotDaemonTray;
@ -136,7 +138,7 @@ public:
PilotDaemon(); PilotDaemon();
~PilotDaemon(); ~PilotDaemon();
enum DaemonStatus enum DaemontqStatus
{ {
HOTSYNC_START, // Hotsync is running HOTSYNC_START, // Hotsync is running
HOTSYNC_END, // Hotsync is cleaning up HOTSYNC_END, // Hotsync is cleaning up
@ -147,7 +149,7 @@ public:
NOT_LISTENING NOT_LISTENING
}; };
DaemonStatus status() const { return fDaemonStatus; } ; DaemontqStatus status() const { return fDaemontqStatus; } ;
/* DCOP */ virtual TQString statusString(); /* DCOP */ virtual TQString statusString();
/* DCOP */ virtual TQString shorStatusString(); /* DCOP */ virtual TQString shorStatusString();
@ -163,7 +165,15 @@ public:
// Some are also slots. // Some are also slots.
// //
public slots: public slots:
// MOC_SKIP_BEGIN
#ifdef Q_MOC_RUN
virtual void requestSync(int);
#else // Q_MOC_RUN
// MOC_SKIP_END
virtual ASYNC requestSync(int); virtual ASYNC requestSync(int);
// MOC_SKIP_BEGIN
#endif // Q_MOC_RUN
// MOC_SKIP_END
public: public:
virtual ASYNC requestSyncType(TQString); virtual ASYNC requestSyncType(TQString);
virtual ASYNC requestRegularSyncNext(); virtual ASYNC requestRegularSyncNext();
@ -188,7 +198,7 @@ public:
virtual bool killDaemonOnExit(); virtual bool killDaemonOnExit();
protected: protected:
DaemonStatus fDaemonStatus; DaemontqStatus fDaemontqStatus;
enum postSyncActions { enum postSyncActions {
None=0, None=0,
@ -234,7 +244,7 @@ private:
/** /**
* Set or change the tooltip displayed by the tray icon. * Set or change the tooltip displayed by the tray icon.
*/ */
void updateTrayStatus(const TQString &s=TQString::null); void updateTraytqStatus(const TQString &s=TQString());
FileInstaller *fInstaller; FileInstaller *fInstaller;

@ -67,7 +67,7 @@ KCal::CalendarLocal *CalendarDumped::retrieve(const TQString &fn)
KCal::CalendarLocal *retrieve(DatebookDB *db) KCal::CalendarLocal *retrieve(DatebookDB *db)
{ {
KCal::CalendarLocal *cal = new CalendarLocal( TQString::null ); KCal::CalendarLocal *cal = new CalendarLocal( TQString() );
int count = db->db()->recordCount(); int count = db->db()->recordCount();

@ -45,8 +45,8 @@
TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo, TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo,
TQWidget * parent, const char *name) : TQWidget * tqparent, const char *name) :
KDialogBase(parent, name, false, i18n("To-do Editor"), Ok|Cancel), KDialogBase(tqparent, name, false, i18n("To-do Editor"), Ok|Cancel),
fDeleteOnCancel(p == 0L), fDeleteOnCancel(p == 0L),
fTodo(p), fTodo(p),
fAppInfo(appInfo) fAppInfo(appInfo)
@ -57,7 +57,7 @@ TodoEditor::TodoEditor(PilotTodoEntry * p, struct ToDoAppInfo *appInfo,
setMainWidget(fWidget); setMainWidget(fWidget);
fillFields(); fillFields();
connect(parent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)), connect(tqparent, TQT_SIGNAL(recordChanged(PilotTodoEntry *)),
this, TQT_SLOT(updateRecord(PilotTodoEntry *))); this, TQT_SLOT(updateRecord(PilotTodoEntry *)));
} }

@ -44,12 +44,13 @@ class TodoEditorBase;
class TodoEditor : public KDialogBase class TodoEditor : public KDialogBase
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
TodoEditor(PilotTodoEntry *todo, TodoEditor(PilotTodoEntry *todo,
struct ToDoAppInfo *appInfo, struct ToDoAppInfo *appInfo,
TQWidget *parent, const char *name=0L); TQWidget *tqparent, const char *name=0L);
~TodoEditor(); ~TodoEditor();

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>TodoEditorBase</class> <class>TodoEditorBase</class>
<widget class="QWidget"> <widget class="TQWidget">
<property name="name"> <property name="name">
<cstring>TodoEditorBase</cstring> <cstring>TodoEditorBase</cstring>
</property> </property>
@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="QLabel" row="0" column="0"> <widget class="TQLabel" row="0" column="0">
<property name="name"> <property name="name">
<cstring>fDescriptionLabel</cstring> <cstring>fDescriptionLabel</cstring>
</property> </property>
@ -38,7 +38,7 @@
<cstring>fDescription</cstring> <cstring>fDescription</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="4" column="0"> <widget class="TQLabel" row="4" column="0">
<property name="name"> <property name="name">
<cstring>fNoteLabel</cstring> <cstring>fNoteLabel</cstring>
</property> </property>
@ -60,7 +60,7 @@
<cstring>fNote</cstring> <cstring>fNote</cstring>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="2" column="2"> <widget class="TQLabel" row="2" column="2">
<property name="name"> <property name="name">
<cstring>fCategoryLabel</cstring> <cstring>fCategoryLabel</cstring>
</property> </property>
@ -74,7 +74,7 @@
<cstring>fCategory</cstring> <cstring>fCategory</cstring>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="2" column="3"> <widget class="TQComboBox" row="2" column="3">
<property name="name"> <property name="name">
<cstring>fCategory</cstring> <cstring>fCategory</cstring>
</property> </property>
@ -82,7 +82,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
<widget class="QLabel" row="1" column="2"> <widget class="TQLabel" row="1" column="2">
<property name="name"> <property name="name">
<cstring>fPriorityLabel</cstring> <cstring>fPriorityLabel</cstring>
</property> </property>
@ -93,7 +93,7 @@
<cstring>fPriority</cstring> <cstring>fPriority</cstring>
</property> </property>
</widget> </widget>
<widget class="QComboBox" row="1" column="3"> <widget class="TQComboBox" row="1" column="3">
<item> <item>
<property name="text"> <property name="text">
<string>1</string> <string>1</string>
@ -123,7 +123,7 @@
<cstring>fPriority</cstring> <cstring>fPriority</cstring>
</property> </property>
</widget> </widget>
<widget class="QTextEdit" row="0" column="1" rowspan="1" colspan="3"> <widget class="TQTextEdit" row="0" column="1" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>fDescription</cstring> <cstring>fDescription</cstring>
</property> </property>
@ -134,12 +134,12 @@
</size> </size>
</property> </property>
</widget> </widget>
<widget class="QTextEdit" row="4" column="1" rowspan="1" colspan="3"> <widget class="TQTextEdit" row="4" column="1" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>fNote</cstring> <cstring>fNote</cstring>
</property> </property>
</widget> </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"> <property name="name">
<cstring>fCompleted</cstring> <cstring>fCompleted</cstring>
</property> </property>
@ -147,7 +147,7 @@
<string>&amp;Completed</string> <string>&amp;Completed</string>
</property> </property>
</widget> </widget>
<widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name"> <property name="name">
<cstring>fHasEndDate</cstring> <cstring>fHasEndDate</cstring>
</property> </property>

@ -49,8 +49,8 @@
TodoCheckListItem::TodoCheckListItem(TQListView*parent, const TQString&text, TodoCheckListItem::TodoCheckListItem(TQListView*tqparent, const TQString&text,
recordid_t pilotid, void*r):PilotCheckListItem(parent, text, pilotid, r) recordid_t pilotid, void*r):PilotCheckListItem(tqparent, text, pilotid, r)
{ {
} }
@ -63,9 +63,9 @@ void TodoCheckListItem::stateChange(bool state)
TodoWidget::TodoWidget(TQWidget * parent, TodoWidget::TodoWidget(TQWidget * tqparent,
const TQString & path) : const TQString & path) :
PilotComponent(parent, "component_todo", path), PilotComponent(tqparent, "component_todo", path),
fTodoInfo(0L), fTodoInfo(0L),
fTodoAppInfo(0L), fTodoAppInfo(0L),
fTodoDB(0L), fTodoDB(0L),
@ -172,7 +172,7 @@ void TodoWidget::showComponent()
#if KDE_VERSION<220 #if KDE_VERSION<220
s = i18n("There are still %1 to-do editing windows open.") s = i18n("There are still %1 to-do editing windows open.")
.arg(TQString::number(fPendingTodos)); .tqarg(TQString::number(fPendingTodos));
#else #else
s = i18n("There is still a to-do editing window open.", s = i18n("There is still a to-do editing window open.",
"There are still %n to-do editing windows open.", "There are still %n to-do editing windows open.",
@ -526,7 +526,7 @@ void TodoWidget::slotShowTodo(TQListViewItem*item)
#endif #endif
TQString text(CSL1("<qt>")); TQString text(CSL1("<qt>"));
text += todo->getTextRepresentation(Qt::RichText); text += todo->getTextRepresentation(TQt::RichText);
text += CSL1("</qt>\n"); text += CSL1("</qt>\n");
fTodoInfo->setText(text); fTodoInfo->setText(text);

@ -41,8 +41,9 @@ class TQTextView;
class TodoListView : public KListView class TodoListView : public KListView
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
TodoListView(TQWidget * parent = 0, const char * name = 0 ):KListView(parent, name){}; TodoListView(TQWidget * tqparent = 0, const char * name = 0 ):KListView(tqparent, name){};
~TodoListView() {}; ~TodoListView() {};
signals: signals:
void itemChecked(TQCheckListItem*item); void itemChecked(TQCheckListItem*item);
@ -58,7 +59,7 @@ public:
class TodoCheckListItem : public PilotCheckListItem class TodoCheckListItem : public PilotCheckListItem
{ {
public: public:
TodoCheckListItem(TQListView*parent, const TQString&text, recordid_t pilotid, void*r); TodoCheckListItem(TQListView*tqparent, const TQString&text, recordid_t pilotid, void*r);
~TodoCheckListItem() {}; ~TodoCheckListItem() {};
virtual void stateChange(bool state); virtual void stateChange(bool state);
}; };
@ -66,9 +67,10 @@ public:
class TodoWidget : public PilotComponent class TodoWidget : public PilotComponent
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
TodoWidget(TQWidget* parent,const TQString& dbpath); TodoWidget(TQWidget* tqparent,const TQString& dbpath);
~TodoWidget(); ~TodoWidget();
// Pilot Component Methods: // Pilot Component Methods:
@ -142,18 +144,18 @@ private:
* currently selected category. * currently selected category.
* *
* The entire todo database is read into memory in the * The entire todo database is read into memory in the
* QList fTodoList. We need the appinfo block from the * TQList fTodoList. We need the appinfo block from the
* database to determine which categories there are; this * database to determine which categories there are; this
* is held in fTodoAppInfo. * is held in fTodoAppInfo.
* *
* The two buttons should speak for themselves. * The two buttons should speak for themselves.
*/ */
QComboBox *fCatList; TQComboBox *fCatList;
QTextView *fTodoInfo; TQTextView *fTodoInfo;
PilotToDoInfo *fTodoAppInfo; PilotToDoInfo *fTodoAppInfo;
TQPtrList<PilotTodoEntry> fTodoList; TQPtrList<PilotTodoEntry> fTodoList;
TodoListView *fListBox; TodoListView *fListBox;
QPushButton *fEditButton,*fDeleteButton; TQPushButton *fEditButton,*fDeleteButton;
PilotDatabase *fTodoDB; PilotDatabase *fTodoDB;
protected: protected:
/** /**

@ -1,5 +1,5 @@
#ifndef _KPILOT_ACTIONQUEUE_H #ifndef _KPILOT_ACTIONTQUEUE_H
#define _KPILOT_ACTIONQUEUE_H #define _KPILOT_ACTIONTQUEUE_H
/* /*
** **
** Copyright (C) 1998-2001,2003 by Dan Pilone ** Copyright (C) 1998-2001,2003 by Dan Pilone
@ -57,6 +57,7 @@
KDE_EXPORT class ActionQueue : public SyncAction KDE_EXPORT class ActionQueue : public SyncAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** /**
* Constructor. Pass in a KPilot device link for it to act on. * Constructor. Pass in a KPilot device link for it to act on.

@ -52,8 +52,8 @@ WelcomeAction::WelcomeAction(KPilotLink *p) :
FUNCTIONSETUP; FUNCTIONSETUP;
addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n") addSyncLogEntry(i18n("KPilot %1 HotSync starting...\n")
.arg(TQString::tqfromLatin1(KPILOT_VERSION))); .tqarg(TQString::tqfromLatin1(KPILOT_VERSION)));
emit logMessage( i18n("Using encoding %1 on the handheld.").arg(Pilot::codecName()) ); emit logMessage( i18n("Using encoding %1 on the handheld.").tqarg(Pilot::codecName()) );
emit syncDone(this); emit syncDone(this);
return true; return true;
} }
@ -128,7 +128,7 @@ TestLink::TestLink(KPilotLink * p) :
// Let the KDE User know what's happening // Let the KDE User know what's happening
// Pretty sure all database names are in latin1. // Pretty sure all database names are in latin1.
emit logMessage(i18n("Syncing database %1...") emit logMessage(i18n("Syncing database %1...")
.arg(Pilot::fromPilot(db.name))); .tqarg(Pilot::fromPilot(db.name)));
} }
emit logMessage(i18n("HotSync finished.")); emit logMessage(i18n("HotSync finished."));

@ -67,7 +67,7 @@ public:
* print that message (it must be i18n()ed already) instead of * print that message (it must be i18n()ed already) instead of
* the standard message. * the standard message.
*/ */
SorryAction(KPilotLink *device, const TQString &s=TQString::null); SorryAction(KPilotLink *device, const TQString &s=TQString());
protected: protected:
/** Reimplemented from SyncAction. */ /** Reimplemented from SyncAction. */

@ -32,7 +32,7 @@
#include <tqstring.h> #include <tqstring.h>
#include <tqptrcollection.h> #include <tqptrcollection.h>
class IDMapperXml : public QXmlDefaultHandler class IDMapperXml : public TQXmlDefaultHandler
{ {
public: public:
IDMapperXml( const TQString &file ); IDMapperXml( const TQString &file );

@ -146,7 +146,7 @@ void DeviceCommThread::reset()
{ {
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage,
i18n("Could not open device: %1 (will retry)") i18n("Could not open device: %1 (will retry)")
.arg(link()->pilotPath() ))); .tqarg(link()->pilotPath() )));
} }
link()->fMessages->reset(); link()->fMessages->reset();
@ -155,7 +155,7 @@ void DeviceCommThread::reset()
// Timer already deleted by close() call. // Timer already deleted by close() call.
startOpenTimer(this,fOpenTimer); startOpenTimer(this,fOpenTimer);
link()->fLinkStatus = WaitingForDevice; link()->fLinktqStatus = WaitingForDevice;
} }
/** /**
@ -176,16 +176,16 @@ void DeviceCommThread::openDevice()
// This transition (from Waiting to Found) can only be // This transition (from Waiting to Found) can only be
// taken once. // taken once.
// //
if (link()->fLinkStatus == WaitingForDevice) if (link()->fLinktqStatus == WaitingForDevice)
{ {
link()->fLinkStatus = FoundDevice; link()->fLinktqStatus = FoundDevice;
} }
if (link()->fMessages->shouldPrint(Messages::OpenMessage)) if (link()->fMessages->shouldPrint(Messages::OpenMessage))
{ {
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage, TQApplication::postEvent(link(), new DeviceCommEvent(EventLogMessage,
i18n("Trying to open device %1...") i18n("Trying to open device %1...")
.arg(link()->fPilotPath))); .tqarg(link()->fPilotPath)));
} }
// if we're not supposed to be done, try to open the main pilot // if we're not supposed to be done, try to open the main pilot
@ -244,7 +244,7 @@ bool DeviceCommThread::open(const TQString &device)
<< link()->fRealPilotPath << "] already connected." << endl; << link()->fRealPilotPath << "] already connected." << endl;
WARNINGKPILOT << msg << endl; WARNINGKPILOT << msg << endl;
link()->fLinkStatus = PilotLinkError; link()->fLinktqStatus = PilotLinkError;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg)); TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
@ -259,11 +259,11 @@ bool DeviceCommThread::open(const TQString &device)
{ {
e = errno; e = errno;
msg = i18n("Cannot create socket for communicating " msg = i18n("Cannot create socket for communicating "
"with the Pilot (%1)").arg(errorMessage(e)); "with the Pilot (%1)").tqarg(errorMessage(e));
DEBUGKPILOT << msg << endl; DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl; DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
link()->fLinkStatus = PilotLinkError; link()->fLinktqStatus = PilotLinkError;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg)); TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, msg));
@ -272,7 +272,7 @@ bool DeviceCommThread::open(const TQString &device)
DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl; DEBUGKPILOT << fname << ": Got socket: [" << fTempSocket << "]" << endl;
link()->fLinkStatus = CreatedSocket; link()->fLinktqStatus = CreatedSocket;
DEBUGKPILOT << fname << ": Binding to path: [" DEBUGKPILOT << fname << ": Binding to path: ["
<< link()->fRealPilotPath << "]" << endl; << link()->fRealPilotPath << "]" << endl;
@ -286,12 +286,12 @@ bool DeviceCommThread::open(const TQString &device)
<< strerror(errno) << "]" << endl; << strerror(errno) << "]" << endl;
e = errno; e = errno;
msg = i18n("Cannot open Pilot port \"%1\". ").arg(link()->fRealPilotPath); msg = i18n("Cannot open Pilot port \"%1\". ").tqarg(link()->fRealPilotPath);
DEBUGKPILOT << msg << endl; DEBUGKPILOT << msg << endl;
DEBUGKPILOT << "(" << strerror(e) << ")" << endl; DEBUGKPILOT << "(" << strerror(e) << ")" << endl;
link()->fLinkStatus = PilotLinkError; link()->fLinktqStatus = PilotLinkError;
if (link()->fMessages->shouldPrint(Messages::OpenFailMessage)) if (link()->fMessages->shouldPrint(Messages::OpenFailMessage))
{ {
@ -301,7 +301,7 @@ bool DeviceCommThread::open(const TQString &device)
return false; return false;
} }
link()->fLinkStatus = DeviceOpen; link()->fLinktqStatus = DeviceOpen;
DeviceMap::self()->bindDevice(link()->fRealPilotPath); DeviceMap::self()->bindDevice(link()->fRealPilotPath);
fSocketNotifier = new TQSocketNotifier(fTempSocket, fSocketNotifier = new TQSocketNotifier(fTempSocket,
@ -394,7 +394,7 @@ void DeviceCommThread::acceptDevice()
return; return;
} }
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 10)); TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 10));
DEBUGKPILOT << fname << DEBUGKPILOT << fname <<
": Listening to pilot. Now trying accept..." << endl; ": Listening to pilot. Now trying accept..." << endl;
@ -409,28 +409,28 @@ void DeviceCommThread::acceptDevice()
WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl; WARNINGKPILOT << "pi_accept returned: [" << s << "]" << endl;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
.arg(TQString::fromLocal8Bit(s)))); .tqarg(TQString::fromLocal8Bit(s))));
link()->fLinkStatus = PilotLinkError; link()->fLinktqStatus = PilotLinkError;
reset(); reset();
return; return;
} }
DEBUGKPILOT << fname << ": Link accept done." << endl; DEBUGKPILOT << fname << ": Link accept done." << endl;
if ((link()->fLinkStatus != DeviceOpen) || (fPilotSocket == -1)) if ((link()->fLinktqStatus != DeviceOpen) || (fPilotSocket == -1))
{ {
link()->fLinkStatus = PilotLinkError; link()->fLinktqStatus = PilotLinkError;
WARNINGKPILOT << "Already connected or unable to connect!" << endl; WARNINGKPILOT << "Already connected or unable to connect!" << endl;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)") TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, i18n("Cannot accept Pilot (%1)")
.arg(i18n("already connected")))); .tqarg(i18n("already connected"))));
reset(); reset();
return; return;
} }
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 30)); TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 30));
DEBUGKPILOT << fname << ": doing dlp_ReadSysInfo..." << endl; DEBUGKPILOT << fname << ": doing dlp_ReadSysInfo..." << endl;
@ -440,7 +440,7 @@ void DeviceCommThread::acceptDevice()
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError, TQApplication::postEvent(link(), new DeviceCommEvent(EventLogError,
i18n("Unable to read system information from Pilot"))); i18n("Unable to read system information from Pilot")));
link()->fLinkStatus=PilotLinkError; link()->fLinktqStatus=PilotLinkError;
reset(); reset();
return; return;
} }
@ -461,7 +461,7 @@ void DeviceCommThread::acceptDevice()
fWorkaroundUSBTimer->stop(); fWorkaroundUSBTimer->stop();
KPILOT_DELETE(fWorkaroundUSBTimer); KPILOT_DELETE(fWorkaroundUSBTimer);
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 60)); TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 60));
KPILOT_DELETE(link()->fPilotUser); KPILOT_DELETE(link()->fPilotUser);
link()->fPilotUser = new KPilotUser; link()->fPilotUser = new KPilotUser;
@ -488,9 +488,9 @@ void DeviceCommThread::acceptDevice()
"Perhaps you have a password set on the device?"))); "Perhaps you have a password set on the device?")));
} }
link()->fLinkStatus = AcceptedDevice; link()->fLinktqStatus = AcceptedDevice;
TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString::null, 100)); TQApplication::postEvent(link(), new DeviceCommEvent(EventLogProgress, TQString(), 100));
DeviceCommEvent * ev = new DeviceCommEvent(EventDeviceReady); DeviceCommEvent * ev = new DeviceCommEvent(EventDeviceReady);
ev->setCurrentSocket(fPilotSocket); ev->setCurrentSocket(fPilotSocket);
@ -527,9 +527,9 @@ void DeviceCommThread::run()
DEBUGKPILOT << fname << ": comm thread now done..." << endl; DEBUGKPILOT << fname << ": comm thread now done..." << endl;
} }
KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name, KPilotDeviceLink::KPilotDeviceLink(TQObject * tqparent, const char *name,
const TQString &tempDevice) : const TQString &tempDevice) :
KPilotLink(parent, name), fLinkStatus(Init), fWorkaroundUSB(false), KPilotLink(tqparent, name), fLinktqStatus(Init), fWorkaroundUSB(false),
fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L) fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -550,7 +550,7 @@ KPilotDeviceLink::~KPilotDeviceLink()
/* virtual */bool KPilotDeviceLink::isConnected() const /* virtual */bool KPilotDeviceLink::isConnected() const
{ {
return fLinkStatus == AcceptedDevice; return fLinktqStatus == AcceptedDevice;
} }
/* virtual */bool KPilotDeviceLink::event(TQEvent *e) /* virtual */bool KPilotDeviceLink::event(TQEvent *e)
@ -640,12 +640,12 @@ void KPilotDeviceLink::reset(const TQString & dP)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
fLinkStatus = Init; fLinktqStatus = Init;
// Release all resources // Release all resources
// //
close(); close();
fPilotPath = TQString::null; fPilotPath = TQString();
fPilotPath = dP; fPilotPath = dP;
if (fPilotPath.isEmpty()) if (fPilotPath.isEmpty())
@ -670,7 +670,7 @@ void KPilotDeviceLink::startCommThread()
TQString msg = i18n("The Pilot device is not configured yet."); TQString msg = i18n("The Pilot device is not configured yet.");
WARNINGKPILOT << msg << endl; WARNINGKPILOT << msg << endl;
fLinkStatus = PilotLinkError; fLinktqStatus = PilotLinkError;
emit logError(msg); emit logError(msg);
return; return;
@ -689,7 +689,7 @@ void KPilotDeviceLink::reset()
checkDevice(); checkDevice();
fLinkStatus = WaitingForDevice; fLinktqStatus = WaitingForDevice;
startCommThread(); startCommThread();
} }
@ -707,7 +707,7 @@ void KPilotDeviceLink::checkDevice()
if (!(fi.isReadable() && fi.isWritable())) if (!(fi.isReadable() && fi.isWritable()))
{ {
emit logError(i18n("Pilot device %1 is not read-write.") emit logError(i18n("Pilot device %1 is not read-write.")
.arg(fPilotPath)); .tqarg(fPilotPath));
} }
} }
else else
@ -718,7 +718,7 @@ void KPilotDeviceLink::checkDevice()
emit emit
logError(i18n("Pilot device %1 does not exist. " logError(i18n("Pilot device %1 does not exist. "
"Probably it is a USB device and will appear during a HotSync.") "Probably it is a USB device and will appear during a HotSync.")
.arg(fPilotPath)); .tqarg(fPilotPath));
// Suppress all normal and error messages about opening the device. // Suppress all normal and error messages about opening the device.
fMessages->block(Messages::OpenMessage | Messages::OpenFailMessage, fMessages->block(Messages::OpenMessage | Messages::OpenFailMessage,
true); true);
@ -788,7 +788,7 @@ int KPilotDeviceLink::openConduit()
return dlp_OpenConduit(fPilotSocket); return dlp_OpenConduit(fPilotSocket);
} }
TQString KPilotDeviceLink::statusString(LinkStatus l) TQString KPilotDeviceLink::statusString(LinktqStatus l)
{ {
TQString s= CSL1("KPilotDeviceLink="); TQString s= CSL1("KPilotDeviceLink=");

@ -42,7 +42,7 @@ class DeviceCommThread; ///< Thread for doing all palm device communications
* it waits for the actual device to become available, and * it waits for the actual device to become available, and
* then becomes ready to handle syncing. * then becomes ready to handle syncing.
*/ */
enum LinkStatus { enum LinktqStatus {
Init, Init,
WaitingForDevice, WaitingForDevice,
FoundDevice, FoundDevice,
@ -75,20 +75,21 @@ friend class PilotSerialDatabase;
friend class DeviceCommThread; friend class DeviceCommThread;
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** /**
* Constructor. Creates a link that can sync to a physical handheld. * Constructor. Creates a link that can sync to a physical handheld.
* Call reset() on it to start looking for a device. * Call reset() on it to start looking for a device.
* *
* @param parent Parent object. * @param tqparent Parent object.
* @param name Name of this object. * @param name Name of this object.
* @param tempDevice Path to device node to use as an alternative * @param tempDevice Path to device node to use as an alternative
* to the "normal" one set by KPilot. * to the "normal" one set by KPilot.
*/ */
KPilotDeviceLink( TQObject *parent = 0, KPilotDeviceLink( TQObject *tqparent = 0,
const char *name = 0, const char *name = 0,
const TQString &tempDevice = TQString::null ); const TQString &tempDevice = TQString() );
/** /**
* Destructor. This rudely ends the communication with the handheld. * Destructor. This rudely ends the communication with the handheld.
@ -99,15 +100,15 @@ public:
/** /**
* Get the status (state enum) of this link. * Get the status (state enum) of this link.
* @return The LinkStatus enum for the link's current state. * @return The LinktqStatus enum for the link's current state.
*/ */
LinkStatus status() const LinktqStatus status() const
{ {
return fLinkStatus; return fLinktqStatus;
} }
/** Get a human-readable string for the given status @p l. */ /** Get a human-readable string for the given status @p l. */
static TQString statusString(LinkStatus l); static TQString statusString(LinktqStatus l);
// The following API is the actual implementation of // The following API is the actual implementation of
// the KPilotLink API, for documentation see that file. // the KPilotLink API, for documentation see that file.
@ -140,7 +141,7 @@ protected:
private: private:
LinkStatus fLinkStatus; LinktqStatus fLinktqStatus;
public: public:

@ -109,8 +109,8 @@ private:
class Messages class Messages
{ {
public: public:
Messages(KPilotDeviceLink *parent) : Messages(KPilotDeviceLink *tqparent) :
fDeviceLink(parent) fDeviceLink(tqparent)
{ {
reset(); reset();
} }
@ -170,10 +170,10 @@ protected:
KPilotDeviceLink *fDeviceLink; KPilotDeviceLink *fDeviceLink;
}; };
class DeviceCommEvent : public QEvent class DeviceCommEvent : public TQEvent
{ {
public: public:
DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString::null, DeviceCommEvent(DeviceCustomEvents type, TQString msg = TQString(),
int progress = 0) : int progress = 0) :
TQEvent( (TQEvent::Type)type ), fMessage(msg), fProgress(progress), TQEvent( (TQEvent::Type)type ), fMessage(msg), fProgress(progress),
fPilotSocket(-1) fPilotSocket(-1)
@ -207,15 +207,16 @@ private:
}; };
/** Class that handles all device communications. We do this /** Class that handles all device communications. We do this
in a different thread so that we do not block the main Qt in a different thread so that we do not block the main TQt
Event thread (similar to Swing's AWT event dispatch thread). Event thread (similar to Swing's AWT event dispatch thread).
*/ */
class DeviceCommThread : public TQObject, public QThread class DeviceCommThread : public TQObject, public TQThread
{ {
friend class KPilotDeviceLink; friend class KPilotDeviceLink;
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
DeviceCommThread(KPilotDeviceLink *d); DeviceCommThread(KPilotDeviceLink *d);
@ -239,7 +240,7 @@ protected:
* Does the low-level opening of the device and handles the * Does the low-level opening of the device and handles the
* pilot-link library initialisation. * pilot-link library initialisation.
*/ */
bool open(const TQString &device = TQString::null); bool open(const TQString &device = TQString());
protected slots: protected slots:
/** /**

@ -70,7 +70,7 @@
* the virtual tickle() method; deals with cancels through the * the virtual tickle() method; deals with cancels through the
* shared fDone variable. * shared fDone variable.
*/ */
class TickleThread : public QThread class TickleThread : public TQThread
{ {
public: public:
TickleThread(KPilotLink *d, bool *done, int timeout) : TickleThread(KPilotLink *d, bool *done, int timeout) :
@ -137,9 +137,9 @@ void TickleThread::run()
KPilotLink::KPilotLink( TQObject *parent, const char *name ) : KPilotLink::KPilotLink( TQObject *tqparent, const char *name ) :
TQObject( parent, name ), TQObject( tqparent, name ),
fPilotPath(TQString::null), fPilotPath(TQString()),
fPilotUser(0L), fPilotUser(0L),
fPilotSysInfo(0L), fPilotSysInfo(0L),
fTickleDone(true), fTickleDone(true),
@ -229,14 +229,14 @@ unsigned int KPilotLink::installFiles(const TQStringList & l, const bool deleteF
for (i = l.begin(), e = l.end(); i != e; ++i) for (i = l.begin(), e = l.end(); i != e; ++i)
{ {
emit logProgress(TQString::null, emit logProgress(TQString(),
(int) ((100.0 / total) * (float) n)); (int) ((100.0 / total) * (float) n));
if (installFile(*i, deleteFiles)) if (installFile(*i, deleteFiles))
k++; k++;
n++; n++;
} }
emit logProgress(TQString::null, 100); emit logProgress(TQString(), 100);
return k; return k;
} }

@ -168,16 +168,17 @@ class PilotDatabase;
* with a non-zero timeout and that timeout has elapsed. The * with a non-zero timeout and that timeout has elapsed. The
* tickler is stopped before timeout is emitted. * tickler is stopped before timeout is emitted.
*/ */
class KDE_EXPORT KPilotLink : public QObject class KDE_EXPORT KPilotLink : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
friend class SyncAction; friend class SyncAction;
public: public:
/** A list of DBInfo structures. */ /** A list of DBInfo structures. */
typedef TQValueList<struct DBInfo> DBInfoList; typedef TQValueList<struct DBInfo> DBInfoList;
/** Constructor. Use reset() to start looking for a device. */ /** Constructor. Use reset() to start looking for a device. */
KPilotLink( TQObject *parent = 0, const char *name = 0 ); KPilotLink( TQObject *tqparent = 0, const char *name = 0 );
/** Destructor. This rudely interrupts any communication in progress. /** Destructor. This rudely interrupts any communication in progress.
* It is best to call endOfSync() or finishSync() before destroying * It is best to call endOfSync() or finishSync() before destroying
@ -381,7 +382,7 @@ signals:
* time startTickle() is called, you can state how long * time startTickle() is called, you can state how long
* tickling should last (at most) before timing out. * tickling should last (at most) before timing out.
* *
* You can only get a timeout when the Qt event loop is * You can only get a timeout when the TQt event loop is
* running, which somewhat limits the usefulness of timeouts. * running, which somewhat limits the usefulness of timeouts.
*/ */
void timeout(); void timeout();

@ -65,7 +65,7 @@
#include "kpilotlocallink.moc" #include "kpilotlocallink.moc"
typedef QPair<TQString, struct DBInfo> DatabaseDescriptor; typedef TQPair<TQString, struct DBInfo> DatabaseDescriptor;
typedef TQValueList<DatabaseDescriptor> DatabaseDescriptorList; typedef TQValueList<DatabaseDescriptor> DatabaseDescriptorList;
class KPilotLocalLink::Private class KPilotLocalLink::Private
@ -99,7 +99,7 @@ unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private &
TQString dbname = (*i); TQString dbname = (*i);
dbname.remove(dbname.length()-4,4); dbname.remove(dbname.length()-4,4);
TQString dbnamecheck = (*i).left((*i).findRev(CSL1(".pdb"))); TQString dbnamecheck = (*i).left((*i).tqfindRev(CSL1(".pdb")));
Q_ASSERT(dbname == dbnamecheck); Q_ASSERT(dbname == dbnamecheck);
if (PilotLocalDatabase::infoFromFile( path + CSL1("/") + (*i), &dbi)) if (PilotLocalDatabase::infoFromFile( path + CSL1("/") + (*i), &dbi))
@ -118,8 +118,8 @@ unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private &
} }
KPilotLocalLink::KPilotLocalLink( TQObject *parent, const char *name ) : KPilotLocalLink::KPilotLocalLink( TQObject *tqparent, const char *name ) :
KPilotLink(parent,name), KPilotLink(tqparent,name),
fReady(false), fReady(false),
d( new Private ) d( new Private )
{ {

@ -43,8 +43,9 @@
class KDE_EXPORT KPilotLocalLink : public KPilotLink class KDE_EXPORT KPilotLocalLink : public KPilotLink
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
KPilotLocalLink( TQObject *parent=0L, const char *name=0L ); KPilotLocalLink( TQObject *tqparent=0L, const char *name=0L );
virtual ~KPilotLocalLink(); virtual ~KPilotLocalLink();
virtual TQString statusString() const; virtual TQString statusString() const;

@ -55,9 +55,9 @@ static const char debug_spaces[61] =
" "; " ";
TQString rtExpand(const TQString &s, Qt::TextFormat richText) TQString rtExpand(const TQString &s, TQt::TextFormat richText)
{ {
if (richText == Qt::RichText) if (richText == TQt::RichText)
{ {
TQString t(s); TQString t(s);
return t.tqreplace(CSL1("\n"), CSL1("<br/>\n")); return t.tqreplace(CSL1("\n"), CSL1("<br/>\n"));

@ -40,10 +40,6 @@
#include <tqnamespace.h> #include <tqnamespace.h>
#include <tqstring.h> #include <tqstring.h>
#if (QT_VERSION < 0x030300)
#error "This is KPilot for KDE3.5 and won't compile with Qt < 3.3.0"
#endif
#include <kdebug.h> #include <kdebug.h>
#include <kdeversion.h> #include <kdeversion.h>
#include <klocale.h> #include <klocale.h>
@ -144,12 +140,12 @@ inline std::ostream& operator <<(std::ostream &o, const KPilotDepthCount &d)
// Function to expand newlines in rich text to <br>\n // Function to expand newlines in rich text to <br>\n
TQString rtExpand(const TQString &s, Qt::TextFormat richText); TQString rtExpand(const TQString &s, TQt::TextFormat richText);
/** /**
* Convert a struct tm from the pilot-link package to a QDateTime * Convert a struct tm from the pilot-link package to a TQDateTime
*/ */
KDE_EXPORT TQDateTime readTm(const struct tm &t); KDE_EXPORT TQDateTime readTm(const struct tm &t);
/** /**
@ -183,7 +179,7 @@ KDE_EXPORT struct tm writeTm(const TQDate &dt);
#define TODO_I18N(a) TQString::tqfromLatin1(a) #define TODO_I18N(a) TQString::tqfromLatin1(a)
#define TODO_I18N_P(a,b,c) ((c>1) ? a : b) #define TODO_I18N_P(a,b,c) ((c>1) ? a : b)
// Handle some cases for QT_NO_CAST_ASCII and NO_ASCII_CAST. // Handle some cases for TQT_NO_CAST_ASCII and NO_ASCII_CAST.
// Where possible in the source, known constant strings in // Where possible in the source, known constant strings in
// latin1 encoding are marked with CSL1(), to avoid gobs // latin1 encoding are marked with CSL1(), to avoid gobs
// of latin1() or fromlatin1() calls which might obscure // of latin1() or fromlatin1() calls which might obscure

@ -144,7 +144,7 @@ TQString category(const struct CategoryAppInfo *info, unsigned int i)
{ {
if (!info || (i>=CATEGORY_COUNT)) if (!info || (i>=CATEGORY_COUNT))
{ {
return TQString::null; return TQString();
} }
mutex->lock(); mutex->lock();

@ -55,7 +55,7 @@ class PilotCategoryInfo; // ... and category information
/** /**
* The Pilot namespace holds constants that are global for * The Pilot namespace holds constants that are global for
* the handheld data structures. Also tqcontains some global * the handheld data structures. Also contains some global
* functions that deal with pilot-link structures as well * functions that deal with pilot-link structures as well
* as mapping user-visible strings from UTF8 (KDE side) to * as mapping user-visible strings from UTF8 (KDE side) to
* the encoding used on the handheld. * the encoding used on the handheld.
@ -106,7 +106,7 @@ namespace Pilot
* native 8 bit encoding of the handheld. * native 8 bit encoding of the handheld.
* *
* @param s String to encode * @param s String to encode
* @return Encoded string in a QCString * @return Encoded string in a TQCString
*/ */
TQCString toPilot( const TQString &s ); TQCString toPilot( const TQString &s );
@ -141,9 +141,9 @@ namespace Pilot
} }
/** Returns the TQString for the requested category @p i /** Returns the TQString for the requested category @p i
* in the category structure @p info. Returns @c TQString::null * in the category structure @p info. Returns @c TQString()
* on error (bad pointer or bad category number). May also * on error (bad pointer or bad category number). May also
* return @c TQString::null if the category name is empty. * return @c TQString() if the category name is empty.
*/ */
inline TQString categoryName(const struct CategoryAppInfo *info, unsigned int i) inline TQString categoryName(const struct CategoryAppInfo *info, unsigned int i)
{ {
@ -157,7 +157,7 @@ namespace Pilot
} }
else else
{ {
return TQString::null; return TQString();
} }
} }

@ -171,7 +171,7 @@ unsigned int PhoneSlot::toField() const
PhoneSlot::operator TQString() const PhoneSlot::operator TQString() const
{ {
return TQString("%1,%2").arg(toOffset()).arg(toField()); return TQString("%1,%2").tqarg(toOffset()).tqarg(toField());
} }
#define MAXFIELDS 19 #define MAXFIELDS 19
@ -273,13 +273,13 @@ PilotAddress::~PilotAddress()
free_Address(&fAddressInfo); free_Address(&fAddressInfo);
} }
TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, TQt::TextFormat richText) const
{ {
TQString text, tmp; TQString text, tmp;
TQString par = (richText==Qt::RichText) ?CSL1("<p>"): TQString(); TQString par = (richText==TQt::RichText) ?CSL1("<p>"): TQString();
TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n"); TQString ps = (richText==TQt::RichText) ?CSL1("</p>"):CSL1("\n");
TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n"); TQString br = (richText==TQt::RichText) ?CSL1("<br/>"):CSL1("\n");
// title + name // title + name
text += par; text += par;
@ -293,14 +293,14 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::T
TQString firstName = getField(entryFirstname); TQString firstName = getField(entryFirstname);
if (firstName.isEmpty()) if (firstName.isEmpty())
{ {
// So tqreplace placeholder for first name (%1) with empty // So replace placeholder for first name (%1) with empty
tmp = tmp.arg(TQString()); tmp = tmp.tqarg(TQString());
} }
else else
{ {
tmp = tmp.arg(rtExpand(firstName,richText)); tmp = tmp.tqarg(rtExpand(firstName,richText));
} }
tmp=tmp.arg(rtExpand(getField(entryLastname), richText)); tmp=tmp.tqarg(rtExpand(getField(entryLastname), richText));
text += tmp; text += tmp;
text += ps; text += ps;
@ -335,13 +335,13 @@ TQString PilotAddress::getTextRepresentation(const PilotAddressInfo *info, Qt::T
} }
if (info) if (info)
{ {
tmp=tmp.arg(info->phoneLabel( getPhoneType( i ) )); tmp=tmp.tqarg(info->phoneLabel( getPhoneType( i ) ));
} }
else else
{ {
tmp=tmp.arg(CSL1("Contact: ")); tmp=tmp.tqarg(CSL1("Contact: "));
} }
tmp=tmp.arg(rtExpand(getField(i.toField()), richText)); tmp=tmp.tqarg(rtExpand(getField(i.toField()), richText));
text += tmp; text += tmp;
text += br; text += br;
} }

@ -182,9 +182,9 @@ public:
* - phone[6] = Pager * - phone[6] = Pager
* - phone[7] = Mobile * - phone[7] = Mobile
* *
* Apparently, this order is kept for all languages, just with localized * Aptqparently, this order is kept for all languages, just with localized
* strings. The implementation of the internal methods will assume * strings. The implementation of the internal methods will assume
* this order is kept. In other languages, main can tqreplaced with * this order is kept. In other languages, main can replaced with
* Corporation. * Corporation.
*/ */
class KDE_EXPORT PilotAddress : public PilotRecordBase class KDE_EXPORT PilotAddress : public PilotRecordBase
@ -198,11 +198,11 @@ public:
virtual ~PilotAddress(); virtual ~PilotAddress();
/** Returns a text representation of the address. If @p richText is true, the /** Returns a text representation of the address. If @p richText is true, the
* text will be formatted with Qt-HTML tags. The AppInfo structure @p info * text will be formatted with TQt-HTML tags. The AppInfo structure @p info
* is used to figure out the phone labels; if it is NULL then bogus labels are * is used to figure out the phone labels; if it is NULL then bogus labels are
* used to identify phone types. * used to identify phone types.
*/ */
TQString getTextRepresentation(const PilotAddressInfo *info, Qt::TextFormat richText) const; TQString getTextRepresentation(const PilotAddressInfo *info, TQt::TextFormat richText) const;
/** /**
* @param text set the field value * @param text set the field value
@ -225,7 +225,7 @@ public:
} }
} }
/** Returns the text value of a given field @p field (or TQString::null /** Returns the text value of a given field @p field (or TQString()
* if there is no such field). * if there is no such field).
*/ */
TQString getField(int field) const; TQString getField(int field) const;

@ -102,7 +102,7 @@ public:
return Pilot::findCategory(fC,name,unknownIsUnfiled); return Pilot::findCategory(fC,name,unknownIsUnfiled);
} ; } ;
/** Gets a single category name. Returns TQString::null if there is no /** Gets a single category name. Returns TQString() if there is no
* such category number @p i . */ * such category number @p i . */
inline TQString categoryName(unsigned int i) const inline TQString categoryName(unsigned int i) const
{ {

@ -50,7 +50,7 @@
class KDE_EXPORT PilotDatabase class KDE_EXPORT PilotDatabase
{ {
public: public:
PilotDatabase(const TQString &name = TQString::null); PilotDatabase(const TQString &name = TQString());
virtual ~PilotDatabase(); virtual ~PilotDatabase();

@ -160,23 +160,23 @@ PilotDateEntry & PilotDateEntry::operator = (const PilotDateEntry & e)
} // end of assignment operator } // end of assignment operator
TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText) TQString PilotDateEntry::getTextRepresentation(TQt::TextFormat richText)
{ {
TQString text, tmp; TQString text, tmp;
TQString par = (richText==Qt::RichText) ?CSL1("<p>"):TQString::null; TQString par = (richText==TQt::RichText) ?CSL1("<p>"):TQString();
TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n"); TQString ps = (richText==TQt::RichText) ?CSL1("</p>"):CSL1("\n");
TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n"); TQString br = (richText==TQt::RichText) ?CSL1("<br/>"):CSL1("\n");
// title + name // title + name
text += par; text += par;
tmp=richText?CSL1("<b><big>%1</big></b>"):CSL1("%1"); tmp=richText?CSL1("<b><big>%1</big></b>"):CSL1("%1");
text += tmp.arg(rtExpand(getDescription(), richText)); text += tmp.tqarg(rtExpand(getDescription(), richText));
text += ps; text += ps;
TQDateTime dt(readTm(getEventStart())); TQDateTime dt(readTm(getEventStart()));
TQString startDate(dt.toString(Qt::LocalDate)); TQString startDate(dt.toString(Qt::LocalDate));
text+=par; text+=par;
text+=i18n("Start date: %1").arg(startDate); text+=i18n("Start date: %1").tqarg(startDate);
text+=ps; text+=ps;
if (isEvent()) if (isEvent())
@ -190,7 +190,7 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText)
dt=readTm(getEventEnd()); dt=readTm(getEventEnd());
TQString endDate(dt.toString(Qt::LocalDate)); TQString endDate(dt.toString(Qt::LocalDate));
text+=par; text+=par;
text+=i18n("End date: %1").arg(endDate); text+=i18n("End date: %1").tqarg(endDate);
text+=ps; text+=ps;
} }
@ -201,10 +201,10 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText)
arg(getAdvance()); arg(getAdvance());
switch (getAdvanceUnits()) switch (getAdvanceUnits())
{ {
case advMinutes: tmp=tmp.arg(i18n("minutes")); break; case advMinutes: tmp=tmp.tqarg(i18n("minutes")); break;
case advHours: tmp=tmp.arg(i18n("hours")); break; case advHours: tmp=tmp.tqarg(i18n("hours")); break;
case advDays: tmp=tmp.arg(i18n("days")); break; case advDays: tmp=tmp.tqarg(i18n("days")); break;
default: tmp=tmp.arg(TQString::null); break;; default: tmp=tmp.tqarg(TQString()); break;;
} }
text+=tmp; text+=tmp;
text+=ps; text+=ps;
@ -215,16 +215,16 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText)
text+=par; text+=par;
tmp=i18n("Recurrence: every %1 %2"); tmp=i18n("Recurrence: every %1 %2");
int freq = getRepeatFrequency(); int freq = getRepeatFrequency();
tmp=tmp.arg(freq); tmp=tmp.tqarg(freq);
switch(getRepeatType()) switch(getRepeatType())
{ {
case repeatDaily: tmp=tmp.arg(i18n("day(s)")); break; case repeatDaily: tmp=tmp.tqarg(i18n("day(s)")); break;
case repeatWeekly: tmp=tmp.arg(i18n("week(s)")); break; case repeatWeekly: tmp=tmp.tqarg(i18n("week(s)")); break;
case repeatMonthlyByDay: case repeatMonthlyByDay:
case repeatMonthlyByDate: tmp=tmp.arg(i18n("month(s)")); break; case repeatMonthlyByDate: tmp=tmp.tqarg(i18n("month(s)")); break;
case repeatYearly: tmp=tmp.arg(i18n("year(s)")); break; case repeatYearly: tmp=tmp.tqarg(i18n("year(s)")); break;
default: tmp=tmp.arg(TQString::null); break; default: tmp=tmp.tqarg(TQString()); break;
} }
text+=tmp; text+=tmp;
text+=br; text+=br;
@ -237,7 +237,7 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText)
else else
{ {
dt = readTm(getRepeatEnd()).date(); dt = readTm(getRepeatEnd()).date();
text+=i18n("Until %1").arg(dt.toString(Qt::LocalDate)); text+=i18n("Until %1").tqarg(dt.toString(Qt::LocalDate));
} }
text+=br; text+=br;
@ -245,7 +245,7 @@ TQString PilotDateEntry::getTextRepresentation(Qt::TextFormat richText)
if (getRepeatType()==repeatMonthlyByDate) text+=i18n("Repeating on the n-th day of the month")+br; if (getRepeatType()==repeatMonthlyByDate) text+=i18n("Repeating on the n-th day of the month")+br;
// TODO: show the dayArray when repeating weekly // TODO: show the dayArray when repeating weekly
/*TQBitArray dayArray(7); /*TQBitArray dayArray(7);
if (getRepeatType()==repeatWeekly) text+=i18n("Repeat day flags: %1").arg(getRepeatDays if (getRepeatType()==repeatWeekly) text+=i18n("Repeat day flags: %1").tqarg(getRepeatDays
const int *days = dateEntry->getRepeatDays(); const int *days = dateEntry->getRepeatDays();
// Rotate the days of the week, since day numbers on the Pilot and // Rotate the days of the week, since day numbers on the Pilot and
// in vCal / Events are different. // in vCal / Events are different.
@ -421,7 +421,7 @@ void PilotDateEntry::setLocation(const TQString &s)
else else
{ {
TQString location = "Location: " + s + "\n"; TQString location = "Location: " + s + "\n";
int pos = note.find(rxp); int pos = note.tqfind(rxp);
if(pos >= 0) if(pos >= 0)
{ {
@ -441,7 +441,7 @@ TQString PilotDateEntry::getLocation() const
// one from PilotDateEntry::getNote(); // one from PilotDateEntry::getNote();
TQString note = Pilot::fromPilot(getNoteP()); TQString note = Pilot::fromPilot(getNoteP());
TQRegExp rxp = TQRegExp("^[Ll]ocation:[^\n]+\n"); TQRegExp rxp = TQRegExp("^[Ll]ocation:[^\n]+\n");
int pos = note.find(rxp, 0); int pos = note.tqfind(rxp, 0);
if(pos >= 0) if(pos >= 0)
{ {

@ -94,7 +94,7 @@ public:
* If @p richText is true, then the text representation uses qt style * If @p richText is true, then the text representation uses qt style
* tags as well. * tags as well.
*/ */
TQString getTextRepresentation(Qt::TextFormat richText); TQString getTextRepresentation(TQt::TextFormat richText);
/** Is this appointment a "floating" appointment? /** Is this appointment a "floating" appointment?
* *

@ -125,7 +125,7 @@ PilotLocalDatabase::PilotLocalDatabase(const TQString &dbName) :
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
int p = dbName.findRev( '/' ); int p = dbName.tqfindRev( '/' );
if (p<0) if (p<0)
{ {
// No slash // No slash
@ -279,7 +279,7 @@ TQValueList<recordid_t> PilotLocalDatabase::idList()
return idlist; return idlist;
} }
// now create the QValue list from the idarr: // now create the TQValue list from the idarr:
for (int i=0; i<idlen; i++) for (int i=0; i<idlen; i++)
{ {
idlist.append((*d)[i]->id()); idlist.append((*d)[i]->id());

@ -74,25 +74,25 @@ PilotRecord *PilotMemo::pack()
} }
TQString PilotMemo::getTextRepresentation(Qt::TextFormat richText) TQString PilotMemo::getTextRepresentation(TQt::TextFormat richText)
{ {
if (richText==Qt::RichText) if (richText==TQt::RichText)
{ {
return i18n("<i>Title:</i> %1<br>\n<i>MemoText:</i><br>%2"). return i18n("<i>Title:</i> %1<br>\n<i>MemoText:</i><br>%2").
arg(rtExpand(getTitle(), richText)).arg(rtExpand(text(), richText)); tqarg(rtExpand(getTitle(), richText)).tqarg(rtExpand(text(), richText));
} }
else else
{ {
return i18n("Title: %1\nMemoText:\n%2").arg(getTitle()).arg(text()); return i18n("Title: %1\nMemoText:\n%2").tqarg(getTitle()).tqarg(text());
} }
} }
TQString PilotMemo::getTitle() const TQString PilotMemo::getTitle() const
{ {
if (fText.isEmpty()) return TQString::null; if (fText.isEmpty()) return TQString();
int memoTitleLen = fText.find('\n'); int memoTitleLen = fText.tqfind('\n');
if (-1 == memoTitleLen) memoTitleLen=fText.length(); if (-1 == memoTitleLen) memoTitleLen=fText.length();
return fText.left(memoTitleLen); return fText.left(memoTitleLen);
} }
@ -106,7 +106,7 @@ TQString PilotMemo::shortTitle() const
return t; return t;
t.truncate(40); t.truncate(40);
int spaceIndex = t.findRev(' '); int spaceIndex = t.tqfindRev(' ');
if (spaceIndex > 32) if (spaceIndex > 32)
{ {

@ -73,7 +73,7 @@ public:
~PilotMemo() { } ; ~PilotMemo() { } ;
virtual TQString getTextRepresentation(Qt::TextFormat richText); virtual TQString getTextRepresentation(TQt::TextFormat richText);
TQString text(void) const { return fText; } ; TQString text(void) const { return fText; } ;
void setText(const TQString &text) { fText = text.left(MAX_MEMO_LEN); } ; void setText(const TQString &text) { fText = text.left(MAX_MEMO_LEN); } ;
TQString getTitle(void) const ; TQString getTitle(void) const ;

@ -54,8 +54,8 @@
/* virtual */ TQString PilotRecord::textRepresentation() const /* virtual */ TQString PilotRecord::textRepresentation() const
{ {
return CSL1("[ %1,%2 ]") return CSL1("[ %1,%2 ]")
.arg(PilotRecordBase::textRepresentation()) .tqarg(PilotRecordBase::textRepresentation())
.arg(size()); .tqarg(size());
} }

@ -56,8 +56,8 @@ PilotSerialDatabase::PilotSerialDatabase(KPilotDeviceLink *l,
} }
PilotSerialDatabase::PilotSerialDatabase( KPilotDeviceLink *l, const DBInfo *info ) : PilotSerialDatabase::PilotSerialDatabase( KPilotDeviceLink *l, const DBInfo *info ) :
PilotDatabase( info ? Pilot::fromPilot( info->name ) : TQString::null ), PilotDatabase( info ? Pilot::fromPilot( info->name ) : TQString() ),
fDBName( TQString::null ), fDBName( TQString() ),
fDBHandle( -1 ), fDBHandle( -1 ),
fDBSocket( l->pilotSocket() ) fDBSocket( l->pilotSocket() )
{ {
@ -157,7 +157,7 @@ TQValueList<recordid_t> PilotSerialDatabase::idList()
return idlist; return idlist;
} }
// now create the QValue list from the idarr: // now create the TQValue list from the idarr:
for (idlen=0; idlen<idlenread; idlen++) for (idlen=0; idlen<idlenread; idlen++)
{ {
idlist.append(idarr[idlen]); idlist.append(idarr[idlen]);

@ -115,17 +115,17 @@ PilotTodoEntry & PilotTodoEntry::operator = (const PilotTodoEntry & e)
return *this; return *this;
} }
TQString PilotTodoEntry::getTextRepresentation(Qt::TextFormat richText) TQString PilotTodoEntry::getTextRepresentation(TQt::TextFormat richText)
{ {
TQString text, tmp; TQString text, tmp;
TQString par = (richText==Qt::RichText) ?CSL1("<p>"): TQString(); TQString par = (richText==TQt::RichText) ?CSL1("<p>"): TQString();
TQString ps = (richText==Qt::RichText) ?CSL1("</p>"):CSL1("\n"); TQString ps = (richText==TQt::RichText) ?CSL1("</p>"):CSL1("\n");
TQString br = (richText==Qt::RichText) ?CSL1("<br/>"):CSL1("\n"); TQString br = (richText==TQt::RichText) ?CSL1("<br/>"):CSL1("\n");
// title + name // title + name
text += par; text += par;
tmp= (richText==Qt::RichText) ?CSL1("<b><big>%1</big></b>"):CSL1("%1"); tmp= (richText==TQt::RichText) ?CSL1("<b><big>%1</big></b>"):CSL1("%1");
text += tmp.arg(rtExpand(getDescription(), richText)); text += tmp.tqarg(rtExpand(getDescription(), richText));
text += ps; text += ps;
text += par; text += par;
@ -140,7 +140,7 @@ TQString PilotTodoEntry::getTextRepresentation(Qt::TextFormat richText)
TQDate dt(readTm(getDueDate()).date()); TQDate dt(readTm(getDueDate()).date());
TQString dueDate(dt.toString(Qt::LocalDate)); TQString dueDate(dt.toString(Qt::LocalDate));
text+=par; text+=par;
text+=i18n("Due date: %1").arg(dueDate); text+=i18n("Due date: %1").tqarg(dueDate);
text+=ps; text+=ps;
} }
@ -148,14 +148,14 @@ TQString PilotTodoEntry::getTextRepresentation(Qt::TextFormat richText)
text+=ps; text+=ps;
text+=par; text+=par;
text+=i18n("Priority: %1").arg(getPriority()); text+=i18n("Priority: %1").tqarg(getPriority());
text+=ps; text+=ps;
if (!getNote().isEmpty()) if (!getNote().isEmpty())
{ {
text += (richText==Qt::RichText) ?CSL1("<hr/>"):CSL1("-------------------------\n"); text += (richText==TQt::RichText) ?CSL1("<hr/>"):CSL1("-------------------------\n");
text+=par; text+=par;
text+= (richText==Qt::RichText) ?i18n("<b><em>Note:</em></b><br>"):i18n("Note:\n"); text+= (richText==TQt::RichText) ?i18n("<b><em>Note:</em></b><br>"):i18n("Note:\n");
text+=rtExpand(getNote(), richText); text+=rtExpand(getNote(), richText);
text+=ps; text+=ps;
} }

@ -72,7 +72,7 @@ public:
/** Return a string for the ToDo item. If @param richText is true, then /** Return a string for the ToDo item. If @param richText is true, then
* use qt style markup to make the string clearer when displayed. * use qt style markup to make the string clearer when displayed.
*/ */
TQString getTextRepresentation(Qt::TextFormat richText); TQString getTextRepresentation(TQt::TextFormat richText);
/** Assign an existing ToDo item to this one. */ /** Assign an existing ToDo item to this one. */
PilotTodoEntry& operator=(const PilotTodoEntry &e); PilotTodoEntry& operator=(const PilotTodoEntry &e);

@ -65,9 +65,9 @@
#include "plugin.moc" #include "plugin.moc"
ConduitConfigBase::ConduitConfigBase(TQWidget *parent, ConduitConfigBase::ConduitConfigBase(TQWidget *tqparent,
const char *name) : const char *name) :
TQObject(parent,name), TQObject(tqparent,name),
fModified(false), fModified(false),
fWidget(0L), fWidget(0L),
fConduitName(i18n("Unnamed")) fConduitName(i18n("Unnamed"))
@ -91,7 +91,7 @@ ConduitConfigBase::~ConduitConfigBase()
FUNCTIONSETUP; FUNCTIONSETUP;
return i18n("<qt>The <i>%1</i> conduit's settings have been changed. Do you " return i18n("<qt>The <i>%1</i> conduit's settings have been changed. Do you "
"want to save the changes before continuing?</qt>").arg(this->conduitName()); "want to save the changes before continuing?</qt>").tqarg(this->conduitName());
} }
/* virtual */ bool ConduitConfigBase::maybeSave() /* virtual */ bool ConduitConfigBase::maybeSave()
@ -102,17 +102,17 @@ ConduitConfigBase::~ConduitConfigBase()
int r = KMessageBox::questionYesNoCancel(fWidget, int r = KMessageBox::questionYesNoCancel(fWidget,
maybeSaveText(), maybeSaveText(),
i18n("%1 Conduit").arg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard()); i18n("%1 Conduit").tqarg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard());
if (r == KMessageBox::Cancel) return false; if (r == KMessageBox::Cancel) return false;
if (r == KMessageBox::Yes) commit(); if (r == KMessageBox::Yes) commit();
return true; return true;
} }
TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) TQWidget *ConduitConfigBase::aboutPage(TQWidget *tqparent, KAboutData *ad)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
TQWidget *w = new TQWidget(parent, "aboutpage"); TQWidget *w = new TQWidget(tqparent, "aboutpage");
TQString s; TQString s;
TQLabel *text; TQLabel *text;
@ -138,7 +138,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
} }
text = new TQLabel(w); text = new TQLabel(w);
// Experiment with a long non-<qt> string. Use that to find // Experiment with a long non-<qt> string. Use that to tqfind
// sensible widths for the columns. // sensible widths for the columns.
// //
text->setText(i18n("Send questions and comments to kdepim-users@kde.org")); text->setText(i18n("Send questions and comments to kdepim-users@kde.org"));
@ -148,7 +148,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
int lineheight = text->size().height(); int lineheight = text->size().height();
// Use the label to display the applciation icon // Use the label to display the applciation icon
text->setText(TQString::null); text->setText(TQString());
text->setPixmap(applicationIcon); text->setPixmap(applicationIcon);
text->adjustSize(); text->adjustSize();
grid->addWidget(text, 0, 1); grid->addWidget(text, 0, 1);
@ -183,27 +183,27 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
if (!p->homepage().isEmpty()) if (!p->homepage().isEmpty())
{ {
s = TQString::null; s = TQString();
s += CSL1("<a href=\"%1\">").arg(p->homepage()); s += CSL1("<a href=\"%1\">").tqarg(p->homepage());
s += p->homepage(); s += p->homepage();
s += CSL1("</a><br>"); s += CSL1("</a><br>");
linktext->append(s); linktext->append(s);
} }
s = TQString::null; s = TQString();
s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.") s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.")
.arg( CSL1("kdepim-users@kde.org") ) .tqarg( CSL1("kdepim-users@kde.org") )
.arg( CSL1("kdepim-users@kde.org") ); .tqarg( CSL1("kdepim-users@kde.org") );
s += ' '; s += ' ';
s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.") s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.")
.arg(p->bugAddress()) .tqarg(p->bugAddress())
.arg(p->bugAddress()); .tqarg(p->bugAddress());
s += ' '; s += ' ';
s += i18n("For trademark information, see the " s += i18n("For trademark information, see the "
"<a href=\"help:/kpilot/trademarks.html\">KPilot User's Guide</a>."); "<a href=\"help:/kpilot/trademarks.html\">KPilot User's Guide</a>.");
s += CSL1("<br>"); s += CSL1("<br>");
linktext->append(s); linktext->append(s);
linktext->append(TQString::null); linktext->append(TQString());
@ -218,15 +218,15 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
for (i=pl.begin(); i!=pl.end(); ++i) for (i=pl.begin(); i!=pl.end(); ++i)
{ {
s.append(CSL1("%1 (<i>%2</i>)%3") s.append(CSL1("%1 (<i>%2</i>)%3")
.arg((*i).name()) .tqarg((*i).name())
.arg((*i).task()) .tqarg((*i).task())
.arg(count<pl.count() ? comma : TQString::null) .tqarg(count<pl.count() ? comma : TQString())
); );
count++; count++;
} }
linktext->append(s); linktext->append(s);
s = TQString::null; s = TQString();
pl = p->credits(); pl = p->credits();
if (pl.count()>0) if (pl.count()>0)
{ {
@ -235,9 +235,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
for (i=pl.begin(); i!=pl.end(); ++i) for (i=pl.begin(); i!=pl.end(); ++i)
{ {
s.append(CSL1("%1 (<i>%2</i>)%3") s.append(CSL1("%1 (<i>%2</i>)%3")
.arg((*i).name()) .tqarg((*i).name())
.arg((*i).task()) .tqarg((*i).task())
.arg(count<pl.count() ? comma : TQString::null) .tqarg(count<pl.count() ? comma : TQString())
); );
count++; count++;
} }
@ -485,8 +485,8 @@ void ConduitAction::finished()
if (hhVolatility > allowedVolatility) if (hhVolatility > allowedVolatility)
{ {
query = query.arg(fConduitName) query = query.tqarg(fConduitName)
.arg(fCtrHH->type()).arg(fCtrHH->moo()); .tqarg(fCtrHH->type()).tqarg(fCtrHH->moo());
DEBUGKPILOT << fname << ": Yikes, lots of volatility " DEBUGKPILOT << fname << ": Yikes, lots of volatility "
<< "caught. Check with user: [" << query << "caught. Check with user: [" << query
@ -494,7 +494,7 @@ void ConduitAction::finished()
/* /*
int rc = questionYesNo(query, caption, int rc = questionYesNo(query, caption,
TQString::null, 0 ); TQString(), 0 );
if (rc == KMessageBox::Yes) if (rc == KMessageBox::Yes)
{ {
// TODO: add commit and rollback code. // TODO: add commit and rollback code.
@ -533,7 +533,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
WARNINGKPILOT << "Can't find desktop file for conduit " WARNINGKPILOT << "Can't find desktop file for conduit "
<< fDesktopName << fDesktopName
<< endl; << endl;
addSyncLogEntry(i18n("Could not find conduit %1.").arg(fDesktopName)); addSyncLogEntry(i18n("Could not find conduit %1.").tqarg(fDesktopName));
return false; return false;
} }
@ -556,7 +556,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
<< " - " << " - "
<< KLibLoader::self()->lastErrorMessage() << KLibLoader::self()->lastErrorMessage()
<< endl; << endl;
addSyncLogEntry(i18n("Could not load conduit %1.").arg(fDesktopName)); addSyncLogEntry(i18n("Could not load conduit %1.").tqarg(fDesktopName));
return false; return false;
} }
@ -568,7 +568,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
<< " has version " << " has version "
<< version << version
<< endl; << endl;
addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").arg(fDesktopName).arg(version)); addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").tqarg(fDesktopName).tqarg(version));
return false; return false;
} }
@ -578,7 +578,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
WARNINGKPILOT << "Can't find factory in library " WARNINGKPILOT << "Can't find factory in library "
<< fLibraryName << fLibraryName
<< endl; << endl;
addSyncLogEntry(i18n("Could not initialize conduit %1.").arg(fDesktopName)); addSyncLogEntry(i18n("Could not initialize conduit %1.").tqarg(fDesktopName));
return false; return false;
} }
@ -591,7 +591,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
if (!object) if (!object)
{ {
WARNINGKPILOT << "Can't create SyncAction." << endl; WARNINGKPILOT << "Can't create SyncAction." << endl;
addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName)); addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName));
return false; return false;
} }
@ -600,11 +600,11 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
if (!fConduit) if (!fConduit)
{ {
WARNINGKPILOT << "Can't cast to ConduitAction." << endl; WARNINGKPILOT << "Can't cast to ConduitAction." << endl;
addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName)); addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName));
return false; return false;
} }
addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName)); addSyncLogEntry(i18n("[Conduit %1]").tqarg(fDesktopName));
// Handle the syncDone signal properly & unload the conduit. // Handle the syncDone signal properly & unload the conduit.
TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)), TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)),
@ -676,7 +676,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg)
} }
} }
return TQString::null; return TQString();
} }
/* static */ bool isRunning(const TQCString &n) /* static */ bool isRunning(const TQCString &n)
@ -704,7 +704,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg)
TQString symbol= CSL1("id_"); TQString symbol= CSL1("id_");
symbol.append(lib->name()); symbol.append(lib->name());
if (!lib->hasSymbol(symbol.latin1())) return TQString::null; if (!lib->hasSymbol(symbol.latin1())) return TQString();
return TQString::tqfromLatin1(*((const char **)(lib->symbol(symbol.latin1())))); return TQString::tqfromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
} }
@ -746,11 +746,11 @@ void CUDCounter::setEndCount(unsigned int t)
TQString CUDCounter::moo() const TQString CUDCounter::moo() const
{ {
TQString result = fType + ": " + TQString result = fType + ": " +
i18n("Start: %1. End: %2. ").arg(fStart).arg(fEnd); i18n("Start: %1. End: %2. ").tqarg(fStart).tqarg(fEnd);
if (fC > 0) result += i18n("%1 new. ").arg(fC); if (fC > 0) result += i18n("%1 new. ").tqarg(fC);
if (fU > 0) result += i18n("%1 changed. ").arg(fU); if (fU > 0) result += i18n("%1 changed. ").tqarg(fU);
if (fD > 0) result += i18n("%1 deleted. ").arg(fD); if (fD > 0) result += i18n("%1 deleted. ").tqarg(fD);
if ( (fC+fU+fD) <= 0) result += i18n("No changes made. "); if ( (fC+fU+fD) <= 0) result += i18n("No changes made. ");

@ -75,15 +75,16 @@ namespace Pilot
* seems a little foolish. * seems a little foolish.
* *
*/ */
class KDE_EXPORT ConduitConfigBase : public QObject class KDE_EXPORT ConduitConfigBase : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** /**
* Constructor. Creates a conduit configuration support object * Constructor. Creates a conduit configuration support object
* with the given parent @p parent and name (optional) @p n. * with the given tqparent @p tqparent and name (optional) @p n.
*/ */
ConduitConfigBase(TQWidget *parent=0L, const char *n=0L); ConduitConfigBase(TQWidget *tqparent=0L, const char *n=0L);
/** Destructor. */ /** Destructor. */
virtual ~ConduitConfigBase(); virtual ~ConduitConfigBase();
@ -151,10 +152,10 @@ public:
* application's icon. This widget can be used pretty much * application's icon. This widget can be used pretty much
* anywhere. Copied from KAboutDialog, mostly. * anywhere. Copied from KAboutDialog, mostly.
* *
* @param parent The widget that holds the about widget. * @param tqparent The widget that holds the about widget.
* @param data The KAboutData that is used to populate the widget. * @param data The KAboutData that is used to populate the widget.
*/ */
static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L); static TQWidget *aboutPage(TQWidget *tqparent, KAboutData *data=0L);
protected: protected:
/** /**
@ -260,6 +261,7 @@ private:
class KDE_EXPORT ConduitAction : public SyncAction class KDE_EXPORT ConduitAction : public SyncAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ConduitAction(KPilotLink *, ConduitAction(KPilotLink *,
@ -367,6 +369,7 @@ private:
class ConduitProxy : public ConduitAction class ConduitProxy : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ConduitProxy(KPilotLink *, ConduitProxy(KPilotLink *,
@ -387,7 +390,7 @@ protected:
/** A namespace containing only static helper methods. */ /** A namespace containing only static helper methods. */
namespace PluginUtility namespace PluginUtility
{ {
/** Searches the argument list for --foo=bar and returns bar, TQString::null if not found. /** Searches the argument list for --foo=bar and returns bar, TQString() if not found.
* Don't include the -- in the argname. */ * Don't include the -- in the argname. */
TQString findArgument(const TQStringList &a, const TQString argname); TQString findArgument(const TQStringList &a, const TQString argname);
@ -418,6 +421,7 @@ namespace PluginUtility
* class KPilotPlugin : public KLibFactory * class KPilotPlugin : public KLibFactory
* { * {
* Q_OBJECT * Q_OBJECT
TQ_OBJECT
* *
* public: * public:
* KPilotPlugin(TQObject * = 0L,const char * = 0L) ; * KPilotPlugin(TQObject * = 0L,const char * = 0L) ;
@ -440,9 +444,9 @@ namespace PluginUtility
* *
* <pre> * <pre>
* protected: * protected:
* virtual TQObject* createObject( TQObject* parent = 0, * virtual TQObject* createObject( TQObject* tqparent = 0,
* const char* name = 0, * const char* name = 0,
* const char* classname = "TQObject", * const char* classname = TQOBJECT_OBJECT_NAME_STRING,
* const TQStringList &args = TQStringList() ); * const TQStringList &args = TQStringList() );
* </pre> * </pre>
* *

@ -45,26 +45,26 @@ class KPilotLink;
template <class Widget, class Action> class ConduitFactory : public KLibFactory template <class Widget, class Action> class ConduitFactory : public KLibFactory
{ {
public: public:
ConduitFactory(TQObject *parent = 0, const char *name = 0) : ConduitFactory(TQObject *tqparent = 0, const char *name = 0) :
KLibFactory(parent,name) KLibFactory(tqparent,name)
{ fInstance = new KInstance(name); } ; { fInstance = new KInstance(name); } ;
virtual ~ConduitFactory() virtual ~ConduitFactory()
{ delete fInstance; } ; { delete fInstance; } ;
protected: protected:
virtual TQObject *createObject( virtual TQObject *createObject(
TQObject* parent = 0, TQObject* tqparent = 0,
const char* name = 0, const char* name = 0,
const char* classname = "TQObject", const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList() ) const TQStringList &args = TQStringList() )
{ {
if (qstrcmp(classname,"ConduitConfigBase")==0) if (qstrcmp(classname,"ConduitConfigBase")==0)
{ {
TQWidget *w = dynamic_cast<TQWidget *>(parent); TQWidget *w = dynamic_cast<TQWidget *>(tqparent);
if (w) return new Widget(w,name); if (w) return new Widget(w,name);
else else
{ {
WARNINGKPILOT << "Could not cast parent to widget." << endl; WARNINGKPILOT << "Could not cast tqparent to widget." << endl;
return 0L; return 0L;
} }
} }
@ -72,11 +72,11 @@ protected:
if (qstrcmp(classname,"SyncAction")==0) if (qstrcmp(classname,"SyncAction")==0)
{ {
KPilotLink *d = 0L; KPilotLink *d = 0L;
if (parent) d = dynamic_cast<KPilotLink *>(parent); if (tqparent) d = dynamic_cast<KPilotLink *>(tqparent);
if (d || !parent) if (d || !tqparent)
{ {
if (!parent) if (!tqparent)
{ {
kdDebug() << k_funcinfo << ": Using NULL device." << endl; kdDebug() << k_funcinfo << ": Using NULL device." << endl;
} }
@ -84,7 +84,7 @@ protected:
} }
else else
{ {
WARNINGKPILOT << "Could not cast parent to KPilotLink" << endl; WARNINGKPILOT << "Could not cast tqparent to KPilotLink" << endl;
return 0L; return 0L;
} }
} }

@ -66,7 +66,7 @@ long version_record_conduit = Pilot::PLUGIN_API;
bool retrieved = false; bool retrieved = false;
if (!openDatabases( fDBName, &retrieved)) if (!openDatabases( fDBName, &retrieved))
{ {
emit logError(i18n("Unable to open the %1 database on the handheld.").arg( fDBName ) ); emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( fDBName ) );
return false; return false;
} }
if (retrieved) setFirstSync(true); if (retrieved) setFirstSync(true);
@ -286,13 +286,13 @@ RecordConduit::~RecordConduit()
// Database names probably in latin1. // Database names probably in latin1.
if( !openDatabases( dbName(), &fFirstSync ) ) if( !openDatabases( dbName(), &fFirstSync ) )
{ {
emit logError(i18n("Unable to open the %1 database on the handheld.").arg( dbName() ) ); emit logError(i18n("Unable to open the %1 database on the handheld.").tqarg( dbName() ) );
return false; return false;
} }
_getAppInfo(); _getAppInfo();
if( !mPCData->loadData() ) if( !mPCData->loadData() )
{ {
emit logError( i18n("Unable to open %1.").arg( mPCData->description() ) ); emit logError( i18n("Unable to open %1.").tqarg( mPCData->description() ) );
return false; return false;
} }
// get the addresseMap which maps Pilot unique record(address) id's to // get the addresseMap which maps Pilot unique record(address) id's to
@ -496,7 +496,7 @@ void RecordConduit::slotDeletedRecord()
} }
TQString uid = mEntryMap[ backupRec->id() ]; TQString uid = mEntryMap[ backupRec->id() ];
PCEntry *pcEntry = mPCData->tqfindByUid( uid ); PCEntry *pcEntry = mPCData->findByUid( uid );
PilotRecord *palmRec = fDatabase->readRecordById( backupRec->id() ); PilotRecord *palmRec = fDatabase->readRecordById( backupRec->id() );
PilotAppCategory *backupEntry = 0L; PilotAppCategory *backupEntry = 0L;
if (backupRec) if (backupRec)
@ -696,16 +696,16 @@ int RecordConduit::compareStr( const TQString & str1, const TQString & str2 )
/** /**
* _getCat returns the id of the category from the given categories list. * _getCat returns the id of the category from the given categories list.
* If the address has no categories on the PC, TQString::null is returned. * If the address has no categories on the PC, TQString() is returned.
* If the current category exists in the list of cats, it is returned * If the current category exists in the list of cats, it is returned
* Otherwise the first cat in the list that exists on the HH is returned * Otherwise the first cat in the list that exists on the HH is returned
* If none of the categories exists on the palm, TQString::null is returned * If none of the categories exists on the palm, TQString() is returned
*/ */
TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString curr ) const TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString curr ) const
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
if ( cats.size() < 1 ) if ( cats.size() < 1 )
return TQString::null; return TQString();
if ( cats.tqcontains( curr ) ) if ( cats.tqcontains( curr ) )
return curr; return curr;
for ( TQStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it) for ( TQStringList::ConstIterator it = cats.begin(); it != cats.end(); ++it)
@ -721,7 +721,7 @@ TQString RecordConduit::getCatForHH( const TQStringList cats, const TQString cur
} }
// If we have a free label, return the first possible cat // If we have a free label, return the first possible cat
TQString lastCat( category( Pilot::CATEGORY_COUNT-1 ) ); TQString lastCat( category( Pilot::CATEGORY_COUNT-1 ) );
return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString::null ); return ( lastCat.isEmpty() ) ? ( cats.first() ) : ( TQString() );
} }
void RecordConduit::setCategory(PCEntry * pcEntry, TQString cat) void RecordConduit::setCategory(PCEntry * pcEntry, TQString cat)
@ -1102,7 +1102,7 @@ RecordConduit::PCEntry *RecordConduit::findMatch( PilotAppCategory *palmEntry )
#endif #endif
if( !id.isEmpty() ) if( !id.isEmpty() )
{ {
PCEntry *res = mPCData->tqfindByUid( id ); PCEntry *res = mPCData->findByUid( id );
if ( !res && !res->isEmpty() ) return res; if ( !res && !res->isEmpty() ) return res;
KPILOT_DELETE( res ); KPILOT_DELETE( res );
#ifdef DEBUG #ifdef DEBUG

@ -56,6 +56,7 @@ class KPilotDeviceLink;
class RecordConduitBase : public ConduitAction class RecordConduitBase : public ConduitAction
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
/** Constructor. The TQStringList @p a sets flags for the ConduitAction. /** Constructor. The TQStringList @p a sets flags for the ConduitAction.
*/ */

@ -65,11 +65,11 @@ SyncAction::SyncAction(KPilotLink *p,
} }
SyncAction::SyncAction(KPilotLink *p, SyncAction::SyncAction(KPilotLink *p,
TQWidget * visibleparent, TQWidget * visibletqparent,
const char *name) : const char *name) :
TQObject(p, name), TQObject(p, name),
fHandle(p), fHandle(p),
fParent(visibleparent) fParent(visibletqparent)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
} }
@ -101,7 +101,7 @@ SyncAction::~SyncAction()
if (!r) if (!r)
{ {
emit logError(i18n("The conduit %1 could not be executed.") emit logError(i18n("The conduit %1 could not be executed.")
.arg(TQString::tqfromLatin1(name()))); .tqarg(TQString::tqfromLatin1(name())));
delayDone(); delayDone();
} }
} }
@ -217,11 +217,11 @@ TQString SyncAction::SyncMode::name() const
if (isTest()) if (isTest())
{ {
s.append(CSL1(" [%1]").arg(i18n("Test Sync"))); s.append(CSL1(" [%1]").tqarg(i18n("Test Sync")));
} }
if (isLocal()) if (isLocal())
{ {
s.append(CSL1(" [%1]").arg(i18n("Local Sync"))); s.append(CSL1(" [%1]").tqarg(i18n("Local Sync")));
} }
return s; return s;
} }
@ -332,7 +332,7 @@ int SyncAction::questionYesNo(const TQString & text,
TQMessageBox::Question, TQMessageBox::Question,
text, text,
TQStringList(), TQStringList(),
(key.isEmpty() ? TQString::null : i18n("&Do not ask again")), (key.isEmpty() ? TQString() : i18n("&Do not ask again")),
&checkboxReturn, &checkboxReturn,
0); 0);
@ -445,7 +445,7 @@ int SyncAction::questionYesNoCancel(const TQString & text,
TQMessageBox::Question, TQMessageBox::Question,
text, text,
TQStringList(), TQStringList(),
(key.isEmpty() ? TQString::null : i18n("&Do not ask again")), (key.isEmpty() ? TQString() : i18n("&Do not ask again")),
&checkboxReturn, &checkboxReturn,
0); 0);
#else #else

@ -47,19 +47,20 @@ class TQTimer;
class KPilotUser; class KPilotUser;
class SyncAction; class SyncAction;
class KDE_EXPORT SyncAction : public QObject class KDE_EXPORT SyncAction : public TQObject
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
SyncAction(KPilotLink *p, SyncAction(KPilotLink *p,
const char *name=0L); const char *name=0L);
SyncAction(KPilotLink *p, SyncAction(KPilotLink *p,
TQWidget *visibleparent, TQWidget *visibletqparent,
const char *name=0L); const char *name=0L);
~SyncAction(); ~SyncAction();
typedef enum { Error=-1 } Status; typedef enum { Error=-1 } tqStatus;
/** A syncaction has a status, which can be expressed as an /** A syncaction has a status, which can be expressed as an
* integer. Subclasses are expected to define their own status * integer. Subclasses are expected to define their own status
@ -67,7 +68,7 @@ public:
*/ */
int status() const int status() const
{ {
return fActionStatus; return fActiontqStatus;
} }
/** Return a human-readable representation of the status. */ /** Return a human-readable representation of the status. */
virtual TQString statusString() const; virtual TQString statusString() const;
@ -155,7 +156,7 @@ public:
protected: protected:
/** Connection to the device. @todo make private. */ /** Connection to the device. @todo make private. */
KPilotLink *fHandle; KPilotLink *fHandle;
int fActionStatus; int fActiontqStatus;
/** Returns a pointer to the connection to the device. */ /** Returns a pointer to the connection to the device. */
inline KPilotLink *deviceLink() const inline KPilotLink *deviceLink() const
@ -184,7 +185,7 @@ public:
/** /**
* This class encapsulates the different sync modes that * This class encapsulates the different sync modes that
* can be used, and enforces a little discipline in changing * can be used, and enforces a little discipline in changing
* the mode and messing around in general. It tqreplaces a * the mode and messing around in general. It replaces a
* simple enum by not much more, but it makes things like * simple enum by not much more, but it makes things like
* local test backups less likely to happen. * local test backups less likely to happen.
* *
@ -393,17 +394,17 @@ protected:
* @p timeout Timeout, in seconds. * @p timeout Timeout, in seconds.
*/ */
int questionYesNo(const TQString &question , int questionYesNo(const TQString &question ,
const TQString &caption = TQString::null, const TQString &caption = TQString(),
const TQString &key = TQString::null, const TQString &key = TQString(),
unsigned timeout = 20, unsigned timeout = 20,
const TQString &yes = TQString::null, const TQString &yes = TQString(),
const TQString &no = TQString::null ); const TQString &no = TQString() );
int questionYesNoCancel(const TQString &question , int questionYesNoCancel(const TQString &question ,
const TQString &caption = TQString::null, const TQString &caption = TQString(),
const TQString &key = TQString::null, const TQString &key = TQString(),
unsigned timeout = 20, unsigned timeout = 20,
const TQString &yes = TQString::null, const TQString &yes = TQString(),
const TQString &no = TQString::null ) ; const TQString &no = TQString() ) ;
}; };

@ -123,7 +123,7 @@ int main(int argc, char **argv)
KCalSync::setEvent(event, d,*fAppointmentAppInfo->categoryInfo()); KCalSync::setEvent(event, d,*fAppointmentAppInfo->categoryInfo());
event->setSyncStatus( KCal::Incidence::SYNCNONE ); event->setSynctqStatus( KCal::Incidence::SYNCNONE );
calendar->addEvent(event); calendar->addEvent(event);

@ -84,8 +84,8 @@ int main(int argc, char **argv)
return 1; return 1;
} }
TQString korgsave = TQString("%1.updated").arg(korgfile); TQString korgsave = TQString("%1.updated").tqarg(korgfile);
TQString newfilesave = TQString("%1.updated").arg(newfile); TQString newfilesave = TQString("%1.updated").tqarg(newfile);
DEBUGKPILOT << "Using korgfile: [" << korgfile DEBUGKPILOT << "Using korgfile: [" << korgfile
<< "]" << endl; << "]" << endl;
@ -154,7 +154,7 @@ int main(int argc, char **argv)
<< pilotId << "]" << endl; << pilotId << "]" << endl;
ev->setPilotId(pilotId); ev->setPilotId(pilotId);
ev->setSyncStatus(KCal::Incidence::SYNCMOD); ev->setSynctqStatus(KCal::Incidence::SYNCMOD);
++numkorgpilotids; ++numkorgpilotids;
} }

@ -81,7 +81,7 @@ int main(int argc, char **argv)
{ {
DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl; DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl;
PilotAddress a( r ); PilotAddress a( r );
DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(&appinfo,Qt::PlainText) << endl; DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(&appinfo,TQt::PlainText) << endl;
DEBUGKPILOT << "# Category#" << a.category() << endl; DEBUGKPILOT << "# Category#" << a.category() << endl;
DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl; DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
DEBUGKPILOT << "# ID " << a.id() << endl; DEBUGKPILOT << "# ID " << a.id() << endl;

@ -53,7 +53,7 @@ TQStringList categories( const PilotAppInfoBase *appinfo )
TQString cat = appinfo->categoryName(i); TQString cat = appinfo->categoryName(i);
if (!cat.isEmpty()) if (!cat.isEmpty())
{ {
TQString s = CSL1("(%1:%2)").arg(i).arg(cat); TQString s = CSL1("(%1:%2)").tqarg(i).tqarg(cat);
cats.append(s); cats.append(s);
} }
} }

@ -79,7 +79,7 @@ int main(int argc, char **argv)
{ {
DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl; DEBUGKPILOT << "# Record @" << (void *)r << " ID=" << r->id() << endl;
PilotDateEntry a( r ); PilotDateEntry a( r );
DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(Qt::PlainText) << endl; DEBUGKPILOT << "# Text Representation:" << endl << a.getTextRepresentation(TQt::PlainText) << endl;
DEBUGKPILOT << "# Category#" << a.category() << endl; DEBUGKPILOT << "# Category#" << a.category() << endl;
DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl; DEBUGKPILOT << "# Category Label " << appinfo.categoryName(a.category()) << endl;
DEBUGKPILOT << "# ID " << a.id() << endl; DEBUGKPILOT << "# ID " << a.id() << endl;

Loading…
Cancel
Save