summaryrefslogtreecommitdiffstats
path: root/conduits/docconduit
diff options
context:
space:
mode:
Diffstat (limited to 'conduits/docconduit')
-rw-r--r--conduits/docconduit/DOC-converter.cc20
-rw-r--r--conduits/docconduit/doc-conduit.cc72
-rw-r--r--conduits/docconduit/doc-conduit.h8
-rw-r--r--conduits/docconduit/doc-conflictdialog.cc24
-rw-r--r--conduits/docconduit/doc-setupdialog.ui8
-rw-r--r--conduits/docconduit/kpalmdoc_dlg.cc46
-rw-r--r--conduits/docconduit/kpalmdoc_dlgbase.ui12
-rw-r--r--conduits/docconduit/pilotDOCEntry.h2
8 files changed, 96 insertions, 96 deletions
diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc
index cff8f19..6502fe5 100644
--- a/conduits/docconduit/DOC-converter.cc
+++ b/conduits/docconduit/DOC-converter.cc
@@ -120,8 +120,8 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks)
// TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
TQString bmkText(bmkName);
for (int i=0; i<=rx.numCaptures(); ++i) {
- bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i));
- bmkText.replace(CSL1("\\%1").tqarg(i), rx.cap(i));
+ bmkText.replace(CSL1("$%1").arg(i), rx.cap(i));
+ bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i));
}
fBookmarks.append(new docBookmark(bmkText.left(16), pos));
}
@@ -195,7 +195,7 @@ TQString DOCConverter::readText() {
TQFile docfile(txtfilename);
if (!docfile.open(IO_ReadOnly))
{
- emit logError(i18n("Unable to open text file %1 for reading.").tqarg(txtfilename));
+ emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename));
return TQString();
}
@@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() {
#endif
if (!docdb->isOpen()) {
- emit logError(i18n("Unable to open palm doc database %1").tqarg(docdb->dbPathName()) );
+ emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) );
return false;
}
@@ -520,7 +520,7 @@ bool DOCConverter::convertPDBtoTXT()
PilotRecord*headerRec = docdb->readRecordByIndex(0);
if (!headerRec)
{
- emit logError(i18n("Unable to read database header for database %1.").tqarg(docdb->dbPathName()));
+ emit logError(i18n("Unable to read database header for database %1.").arg(docdb->dbPathName()));
KPILOT_DELETE(docdb);
return false;
}
@@ -540,7 +540,7 @@ bool DOCConverter::convertPDBtoTXT()
TQFile docfile(txtfilename);
if (!docfile.open(IO_WriteOnly))
{
- emit logError(i18n("Unable to open output file %1.").tqarg(txtfilename));
+ emit logError(i18n("Unable to open output file %1.").arg(txtfilename));
KPILOT_DELETE(docdb);
return false;
}
@@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT()
DEBUGKPILOT<<"Record "<<i<<endl;
KPILOT_DELETE(rec);
} else {
- emit logMessage(i18n("Could not read text record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName()));
+ emit logMessage(i18n("Could not read text record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
}
}
@@ -570,11 +570,11 @@ bool DOCConverter::convertPDBtoTXT()
if (rec)
{
PilotDOCBookmark bookie(rec);
- docBookmark*bmk=new docBookmark(TQString::tqfromLatin1(bookie.bookmarkName), bookie.pos);
+ docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos);
bmks.append(bmk);
KPILOT_DELETE(rec);
} else {
- emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName()));
+ emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName()));
}
}
// TODO: Sort the list of bookmarks according to their position
@@ -592,7 +592,7 @@ bool DOCConverter::convertPDBtoTXT()
if (!bmkfile.open(IO_WriteOnly))
{
emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
- .tqarg(bmkfilename).tqarg(docdb ->dbPathName()));
+ .arg(bmkfilename).arg(docdb ->dbPathName()));
}
else
{
diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc
index 0ac14f1..31a075b 100644
--- a/conduits/docconduit/doc-conduit.cc
+++ b/conduits/docconduit/doc-conduit.cc
@@ -300,7 +300,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
}
if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) {
PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
- TQString::tqfromLatin1(sinfo.dbinfo.name), false);
+ TQString::fromLatin1(sinfo.dbinfo.name), false);
if (database) {
if ( database->deleteDatabase() !=0 ) {
WARNINGKPILOT << "Unable to delete database " << sinfo.dbinfo.name << " on the PC" << endl;
@@ -378,10 +378,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (!postSyncAction(database, sinfo, res))
emit logError(i18n("Unable to install the locally created PalmDOC %1 to the handheld.")
- .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
+ .arg(TQString::fromLatin1(sinfo.dbinfo.name)));
if (!res)
emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
- .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
+ .arg(TQString::fromLatin1(sinfo.dbinfo.name)));
// disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
// disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
// KPILOT_DELETE(database);
@@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
else
{
emit logError(i18n("Unable to open or create the database %1.")
- .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name)));
+ .arg(TQString::fromLatin1(sinfo.dbinfo.name)));
}
return res;
}
@@ -414,21 +414,21 @@ void DOCConduit::syncNextDB() {
// if creator and/or type don't match, go to next db
if (!isCorrectDBTypeCreator(dbinfo) ||
- fDBNames.contains(TQString::tqfromLatin1(dbinfo.name)))
+ fDBNames.contains(TQString::fromLatin1(dbinfo.name)))
{
TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
}
- TQString txtfilename=constructTXTFileName(TQString::tqfromLatin1(dbinfo.name));
- TQString pdbfilename=constructPDBFileName(TQString::tqfromLatin1(dbinfo.name));
+ TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name));
+ TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name));
- docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
+ docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
syncInfo.dbinfo=dbinfo;
needsSync(syncInfo);
fSyncInfoList.append(syncInfo);
- fDBNames.append(TQString::tqfromLatin1(dbinfo.name));
+ fDBNames.append(TQString::fromLatin1(dbinfo.name));
TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
@@ -476,12 +476,12 @@ void DOCConduit::syncNextTXT()
bool alreadySynced=fDBNames.contains(fl.baseName(TRUE));
if (!alreadySynced) {
- docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name),
+ docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
syncInfo.dbinfo=dbinfo;
needsSync(syncInfo);
fSyncInfoList.append(syncInfo);
- fDBNames.append(TQString::tqfromLatin1(dbinfo.name));
+ fDBNames.append(TQString::fromLatin1(dbinfo.name));
} else {
#ifdef DEBUG
DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl;
@@ -665,7 +665,7 @@ void DOCConduit::syncDatabases() {
case eSyncDelete:
case eSyncPDAToPC:
case eSyncPCToPDA:
- emit logMessage(i18n("Synchronizing text \"%1\"").tqarg(sinfo.handheldDB));
+ emit logMessage(i18n("Synchronizing text \"%1\"").arg(sinfo.handheldDB));
if (!doSync(sinfo)) {
// The sync could not be done, so inform the user (the error message should probably issued inside doSync)
#ifdef DEBUG
@@ -701,7 +701,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
FUNCTIONSETUP;
sinfo.direction = eSyncNone;
- PilotDatabase*docdb=openDOCDatabase(TQString::tqfromLatin1(sinfo.dbinfo.name));
+ PilotDatabase*docdb=openDOCDatabase(TQString::fromLatin1(sinfo.dbinfo.name));
if (!fDBListSynced.contains(sinfo.handheldDB)) {
// the database wasn't included on last sync, so it has to be new.
#ifdef DEBUG
@@ -716,29 +716,29 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
N N | C P H
*/
- if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew;
- else sinfo.fPCtqStatus=eStatDoesntExist;
- if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew;
- else sinfo.fPalmtqStatus=eStatDoesntExist;
+ if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
+ else sinfo.fPCStatus=eStatDoesntExist;
+ if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
+ else sinfo.fPalmStatus=eStatDoesntExist;
KPILOT_DELETE(docdb);
switch (eSyncDirection) {
case eSyncPDAToPC:
- if (sinfo.fPalmtqStatus==eStatDoesntExist)
+ if (sinfo.fPalmStatus==eStatDoesntExist)
sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPDAToPC;
break;
case eSyncPCToPDA:
- if (sinfo.fPCtqStatus==eStatDoesntExist)
+ if (sinfo.fPCStatus==eStatDoesntExist)
sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPCToPDA;
break;
case eSyncNone: // means actually both directions!
- if (sinfo.fPCtqStatus==eStatNew) {
- if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict;
+ if (sinfo.fPCStatus==eStatNew) {
+ if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict;
else sinfo.direction=eSyncPCToPDA;
} else {
- if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
+ if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC;
else {
sinfo.direction=eSyncNone;
#ifdef DEBUG
@@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
}
// Text was included in the last sync
- if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted;
+ if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted;
else if(pcTextChanged(sinfo.txtfilename)) {
- sinfo.fPCtqStatus=eStatChanged;
+ sinfo.fPCStatus=eStatChanged;
#ifdef DEBUG
DEBUGKPILOT<<"PC side has changed!"<<endl;
#endif
@@ -769,12 +769,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
#endif
}
- if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted;
+ if (!docdb || !docdb->isOpen()) sinfo.fPalmStatus=eStatDeleted;
else if (hhTextChanged(docdb)) {
#ifdef DEBUG
DEBUGKPILOT<<"Handheld side has changed!"<<endl;
#endif
- sinfo.fPalmtqStatus=eStatChanged;
+ sinfo.fPalmStatus=eStatChanged;
#ifdef DEBUG
} else {
DEBUGKPILOT<<"Handheld side has NOT changed!"<<endl;
@@ -800,7 +800,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
*/
- if (sinfo.fPCtqStatus == eStatNone && sinfo.fPalmtqStatus==eStatNone) {
+ if (sinfo.fPCStatus == eStatNone && sinfo.fPalmStatus==eStatNone) {
#ifdef DEBUG
DEBUGKPILOT<<"Nothing has changed, not need for a sync."<<endl;
#endif
@@ -813,12 +813,12 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// to sync that direction
if (eSyncDirection==eSyncPCToPDA) {
- if (sinfo.fPCtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
+ if (sinfo.fPCStatus==eStatDeleted) sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPCToPDA;
return true;
}
if (eSyncDirection==eSyncPDAToPC) {
- if (sinfo.fPalmtqStatus==eStatDeleted) sinfo.direction=eSyncDelete;
+ if (sinfo.fPalmStatus==eStatDeleted) sinfo.direction=eSyncDelete;
else sinfo.direction=eSyncPDAToPC;
return true;
}
@@ -830,8 +830,8 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// if either is deleted, and the other is not changed, delete
- if ( ((sinfo.fPCtqStatus==eStatDeleted) && (sinfo.fPalmtqStatus!=eStatChanged)) ||
- ((sinfo.fPalmtqStatus==eStatDeleted) && (sinfo.fPCtqStatus!=eStatChanged)) )
+ if ( ((sinfo.fPCStatus==eStatDeleted) && (sinfo.fPalmStatus!=eStatChanged)) ||
+ ((sinfo.fPalmStatus==eStatDeleted) && (sinfo.fPCStatus!=eStatChanged)) )
{
#ifdef DEBUG
DEBUGKPILOT<<"DB was deleted on one side and not changed on "
@@ -843,7 +843,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
// eStatDeleted (and both not changed) have already been treated, for all
// other values in combination with eStatNone, just copy the texts.
- if (sinfo.fPCtqStatus==eStatNone) {
+ if (sinfo.fPCStatus==eStatNone) {
#ifdef DEBUG
DEBUGKPILOT<<"PC side has changed!"<<endl;
#endif
@@ -851,7 +851,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
return true;
}
- if (sinfo.fPalmtqStatus==eStatNone) {
+ if (sinfo.fPalmStatus==eStatNone) {
sinfo.direction=eSyncPCToPDA;
return true;
}
@@ -922,11 +922,11 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
if (DOCConduitSettings::keepPDBsLocally())
{
return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
- TQString::tqfromLatin1(dbinfo.name), false);
+ TQString::fromLatin1(dbinfo.name), false);
}
else
{
- return deviceLink()->database(TQString::tqfromLatin1(dbinfo.name));
+ return deviceLink()->database(TQString::fromLatin1(dbinfo.name));
}
}
@@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database,
if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync())
{
PilotDatabase*db=deviceLink()->database(
- TQString::tqfromLatin1(sinfo.dbinfo.name));
+ TQString::fromLatin1(sinfo.dbinfo.name));
#ifdef DEBUG
DEBUGKPILOT<<"Middle 1 Resetting sync flags for database "
<<sinfo.dbinfo.name<<endl;
diff --git a/conduits/docconduit/doc-conduit.h b/conduits/docconduit/doc-conduit.h
index 7b50adc..a7e7a44 100644
--- a/conduits/docconduit/doc-conduit.h
+++ b/conduits/docconduit/doc-conduit.h
@@ -41,7 +41,7 @@ typedef enum eSyncDirectionEnum {
eSyncDelete,
eSyncConflict
};
-typedef enum eTextqStatus {
+typedef enum eTexStatus {
eStatNone=0,
eStatNew=1,
eStatChanged=2,
@@ -139,14 +139,14 @@ public:
txtfilename=txtfn;
pdbfilename=pdbfn;
direction=dir;
- fPCtqStatus=eStatNone;
- fPalmtqStatus=eStatNone;
+ fPCStatus=eStatNone;
+ fPalmStatus=eStatNone;
};
~docSyncInfo(){};
TQString handheldDB, txtfilename, pdbfilename;
DBInfo dbinfo;
eSyncDirectionEnum direction;
- eTextqStatus fPCtqStatus, fPalmtqStatus;
+ eTexStatus fPCStatus, fPalmStatus;
};
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 32af25f..bf2610a 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -30,7 +30,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqbuttongroup.h>
#include <kmessagebox.h>
#include <tqtimer.h>
@@ -51,17 +51,17 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
// First, insert the texts on top:
textLabel1 = new TQLabel(i18n("Here is a list of all text files and DOC databases the conduit found. The conduit tried to determine the correct sync direction, but for databases in bold red letters a conflict occurred (i.e. the text was changed both on the desktop and on the handheld). For these databases please specify which version is the current one."), page);
- textLabel1->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+ textLabel1->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
topLayout->addWidget(textLabel1);
textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ), page );
- textLabel2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+ textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
topLayout->addWidget(textLabel2);
resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
- TQVBoxLayout*ptqlayout = new TQVBoxLayout(resolutionGroupBox);
+ TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox);
TQScrollView* sv = new TQScrollView(resolutionGroupBox);
- ptqlayout->addWidget(sv);
+ playout->addWidget(sv);
sv->setResizePolicy(TQScrollView::AutoOneFit);
sv->setHScrollBarMode(TQScrollView::AlwaysOff);
sv->setMargin(5);
@@ -70,7 +70,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 );
- resolutionGroupBoxLayout->tqsetAlignment( TQt::AlignTop );
+ resolutionGroupBoxLayout->setAlignment( TQt::AlignTop );
// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
TQButtonGroup *bgroup = new TQButtonGroup( this );
@@ -99,7 +99,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 );
cE.resolution=new TQComboBox( FALSE, big_box);
- cE.resolution->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
+ cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
(TQSizePolicy::SizeType)0, 0, 0,
cE.resolution->sizePolicy().hasHeightForWidth() ) );
cE.resolution->clear();
@@ -123,7 +123,7 @@ ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, s
topLayout->addWidget( resolutionGroupBox );
- resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
+ resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
if (tickleTimer) {
@@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog()
KDialogBase::slotOk();
}
-TQString eTexStatusToString(eTextqStatus stat) {
+TQString eTexStatusToString(eTexStatus stat) {
switch(stat) {
case eStatNone: return i18n("unchanged");
case eStatNew: return i18n("new");
@@ -168,9 +168,9 @@ void ResolutionDialog::slotInfo(int index) {
int ix=cE.index;
if (!syncInfo) return;
docSyncInfo si=(*syncInfo)[ix];
- TQString text=i18n("Status of the database %1:\n\n").tqarg(si.handheldDB);
- text+=i18n("Handheld: %1\n").tqarg(eTexStatusToString(si.fPalmtqStatus));
- text+=i18n("Desktop: %1\n").tqarg(eTexStatusToString(si.fPCtqStatus));
+ TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
+ text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus));
+ text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus));
KMessageBox::information(this, text, i18n("Database information"));
}
diff --git a/conduits/docconduit/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui
index e59025e..e04be16 100644
--- a/conduits/docconduit/doc-setupdialog.ui
+++ b/conduits/docconduit/doc-setupdialog.ui
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -222,7 +222,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -304,7 +304,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -492,7 +492,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index 58ca0aa..20e8d2f 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -73,7 +73,7 @@ ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
- resize(tqminimumSize());
+ resize(minimumSize());
}
ConverterDlg::~ConverterDlg()
@@ -175,8 +175,8 @@ void ConverterDlg::slotToText()
int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
- "<br>Use folder <em>%2</em> instead?</qt>").tqarg(pdburl)
- .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+ "<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl)
+ .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes)
{
pdburl=pdbinfo.dirPath(true);
@@ -191,7 +191,7 @@ void ConverterDlg::slotToText()
KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for "
"the handheld database files is not a valid "
- "folder.</qt>").tqarg(pdburl));
+ "folder.</qt>").arg(pdburl));
return;
}
@@ -200,7 +200,7 @@ void ConverterDlg::slotToText()
KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for "
"the handheld database files is not a "
- "valid directory.</qt>").tqarg(pdburl));
+ "valid directory.</qt>").arg(pdburl));
return;
}
@@ -211,8 +211,8 @@ void ConverterDlg::slotToText()
int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
- "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl)
- .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+ "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
+ .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) {
txturl=txtinfo.dirPath(true);
txtinfo.setFile(txturl);
@@ -227,7 +227,7 @@ void ConverterDlg::slotToText()
if (!txtinfo.isDir()) {
KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for "
- "the text files could not be created.</qt>").tqarg(txturl));
+ "the text files could not be created.</qt>").arg(txturl));
return;
}
@@ -265,7 +265,7 @@ void ConverterDlg::slotToText()
if (!pdbinfo.isFile() || !pdbinfo.exists())
{
KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
- "exist.</qt>").tqarg(pdburl));
+ "exist.</qt>").arg(pdburl));
return;
}
@@ -274,13 +274,13 @@ void ConverterDlg::slotToText()
if (!txtinfo.isFile())
{
KMessageBox::sorry(this, i18n("<qt>The filename <em>%1</em> for the "
- "text is not a valid filename.</qt>").tqarg(txturl));
+ "text is not a valid filename.</qt>").arg(txturl));
return;
}*/
if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(),
txtinfo.dirPath(true), txtinfo.fileName(), &conv) )
{
- KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(pdburl));
+ KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl));
}
}
@@ -324,8 +324,8 @@ void ConverterDlg::slotToPDB()
int res=KMessageBox::questionYesNo(this,
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
- "<br>Use folder <em>%2</em> instead?</qt>").tqarg(txturl)
- .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+ "<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
+ .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes)
{
txturl=txtinfo.dirPath(true);
@@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB()
{
KMessageBox::sorry(this,
i18n("<qt>The folder <em>%1</em> for "
- "the text files is not a valid folder.</qt>").tqarg(txturl));
+ "the text files is not a valid folder.</qt>").arg(txturl));
return;
}
@@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB()
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>")
- .tqarg(pdburl)
- .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
+ .arg(pdburl)
+ .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) {
pdburl=pdbinfo.dirPath(true);
pdbinfo.setFile(pdburl);
@@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB()
}
if (!pdbinfo.isDir()) {
KMessageBox::sorry(this, i18n("<qt>The folder <em>%1</em> for "
- "the PalmDOC files could not be created.</qt>").tqarg(pdburl));
+ "the PalmDOC files could not be created.</qt>").arg(pdburl));
return;
}
@@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB()
if (!txtinfo.isFile() || !txtinfo.exists())
{
KMessageBox::sorry(this, i18n("<qt>The file <em>%1</em> does not "
- "exist.</qt>").tqarg(txturl));
+ "exist.</qt>").arg(txturl));
return;
}
if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(),
pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) )
{
- KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(txturl));
+ KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl));
}
}
@@ -454,7 +454,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
if (!dbfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>")
- .tqarg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
+ .arg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
{
PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb)
@@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
}
if ( !res && verbose )
{
- KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(txtfile));
+ KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(txtfile));
}
}
else
@@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
if (!txtfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>")
- .tqarg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
+ .arg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) ))
{
PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb)
@@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
}
if ( !res && verbose )
{
- KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").tqarg(pdbfile));
+ KMessageBox::sorry(this, i18n("<qt>Error while converting the text %1.</qt>").arg(pdbfile));
}
}
else
diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui
index 9b92d8d..c693e90 100644
--- a/conduits/docconduit/kpalmdoc_dlgbase.ui
+++ b/conduits/docconduit/kpalmdoc_dlgbase.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -181,7 +181,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>200</height>
@@ -329,7 +329,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>190</height>
diff --git a/conduits/docconduit/pilotDOCEntry.h b/conduits/docconduit/pilotDOCEntry.h
index 679f35a..4ecaf19 100644
--- a/conduits/docconduit/pilotDOCEntry.h
+++ b/conduits/docconduit/pilotDOCEntry.h
@@ -50,7 +50,7 @@ public:
TQString getText() {
fText.Decompress();
- return TQString::tqfromLatin1((const char *) fText.text());
+ return TQString::fromLatin1((const char *) fText.text());
};
void setText(TQString newtext, bool compressed = false) {
fText.setText((const unsigned char *) newtext.latin1(),
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 04:32:31 +0000