From d55caffa62947ca831ae0c21aada3b55eec24027 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:02 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 631a19d8c5c5f69dc0d941c1997806fb422c79a6. --- conduits/docconduit/DOC-converter.cc | 20 ++++----- conduits/docconduit/doc-conduit.cc | 72 +++++++++++++++---------------- conduits/docconduit/doc-conduit.h | 8 ++-- conduits/docconduit/doc-conflictdialog.cc | 24 +++++------ conduits/docconduit/doc-setupdialog.ui | 8 ++-- conduits/docconduit/kpalmdoc_dlg.cc | 46 ++++++++++---------- conduits/docconduit/kpalmdoc_dlgbase.ui | 12 +++--- conduits/docconduit/pilotDOCEntry.h | 2 +- 8 files changed, 96 insertions(+), 96 deletions(-) (limited to 'conduits/docconduit') diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc index 6502fe5..cff8f19 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").arg(i), rx.cap(i)); - bmkText.replace(CSL1("\\%1").arg(i), rx.cap(i)); + bmkText.replace(CSL1("$%1").tqarg(i), rx.cap(i)); + bmkText.replace(CSL1("\\%1").tqarg(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.").arg(txtfilename)); + emit logError(i18n("Unable to open text file %1 for reading.").tqarg(txtfilename)); return TQString(); } @@ -437,7 +437,7 @@ bool DOCConverter::convertTXTtoPDB() { #endif if (!docdb->isOpen()) { - emit logError(i18n("Unable to open palm doc database %1").arg(docdb->dbPathName()) ); + emit logError(i18n("Unable to open palm doc database %1").tqarg(docdb->dbPathName()) ); return false; } @@ -520,7 +520,7 @@ bool DOCConverter::convertPDBtoTXT() PilotRecord*headerRec = docdb->readRecordByIndex(0); if (!headerRec) { - emit logError(i18n("Unable to read database header for database %1.").arg(docdb->dbPathName())); + emit logError(i18n("Unable to read database header for database %1.").tqarg(docdb->dbPathName())); KPILOT_DELETE(docdb); return false; } @@ -540,7 +540,7 @@ bool DOCConverter::convertPDBtoTXT() TQFile docfile(txtfilename); if (!docfile.open(IO_WriteOnly)) { - emit logError(i18n("Unable to open output file %1.").arg(txtfilename)); + emit logError(i18n("Unable to open output file %1.").tqarg(txtfilename)); KPILOT_DELETE(docdb); return false; } @@ -555,7 +555,7 @@ bool DOCConverter::convertPDBtoTXT() DEBUGKPILOT<<"Record "<dbPathName())); + emit logMessage(i18n("Could not read text record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName())); } } @@ -570,11 +570,11 @@ bool DOCConverter::convertPDBtoTXT() if (rec) { PilotDOCBookmark bookie(rec); - docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos); + docBookmark*bmk=new docBookmark(TQString::tqfromLatin1(bookie.bookmarkName), bookie.pos); bmks.append(bmk); KPILOT_DELETE(rec); } else { - emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").arg(i).arg(docdb->dbPathName())); + emit logMessage(i18n("Could not read bookmark record #%1 from Database %2").tqarg(i).tqarg(docdb->dbPathName())); } } // TODO: Sort the list of bookmarks according to their position @@ -592,7 +592,7 @@ bool DOCConverter::convertPDBtoTXT() if (!bmkfile.open(IO_WriteOnly)) { emit logError(i18n("Unable to open file %1 for the bookmarks of %2.") - .arg(bmkfilename).arg(docdb ->dbPathName())); + .tqarg(bmkfilename).tqarg(docdb ->dbPathName())); } else { diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc index 31a075b..0ac14f1 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::fromLatin1(sinfo.dbinfo.name), false); + TQString::tqfromLatin1(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.") - .arg(TQString::fromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); if (!res) emit logError(i18n("Conversion of PalmDOC \"%1\" failed.") - .arg(TQString::fromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(sinfo.dbinfo.name))); // disconnect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &))); // disconnect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &))); // KPILOT_DELETE(database); @@ -389,7 +389,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo) else { emit logError(i18n("Unable to open or create the database %1.") - .arg(TQString::fromLatin1(sinfo.dbinfo.name))); + .tqarg(TQString::tqfromLatin1(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::fromLatin1(dbinfo.name))) + fDBNames.contains(TQString::tqfromLatin1(dbinfo.name))) { TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB())); return; } - TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name)); - TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name)); + TQString txtfilename=constructTXTFileName(TQString::tqfromLatin1(dbinfo.name)); + TQString pdbfilename=constructPDBFileName(TQString::tqfromLatin1(dbinfo.name)); - docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(TQString::fromLatin1(dbinfo.name)); + fDBNames.append(TQString::tqfromLatin1(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::fromLatin1(dbinfo.name), + docSyncInfo syncInfo(TQString::tqfromLatin1(dbinfo.name), txtfilename, pdbfilename, eSyncNone); syncInfo.dbinfo=dbinfo; needsSync(syncInfo); fSyncInfoList.append(syncInfo); - fDBNames.append(TQString::fromLatin1(dbinfo.name)); + fDBNames.append(TQString::tqfromLatin1(dbinfo.name)); } else { #ifdef DEBUG DEBUGKPILOT<isOpen()) sinfo.fPalmStatus=eStatNew; - else sinfo.fPalmStatus=eStatDoesntExist; + if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatNew; + else sinfo.fPCtqStatus=eStatDoesntExist; + if (docdb && docdb->isOpen()) sinfo.fPalmtqStatus=eStatNew; + else sinfo.fPalmtqStatus=eStatDoesntExist; KPILOT_DELETE(docdb); switch (eSyncDirection) { case eSyncPDAToPC: - if (sinfo.fPalmStatus==eStatDoesntExist) + if (sinfo.fPalmtqStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPDAToPC; break; case eSyncPCToPDA: - if (sinfo.fPCStatus==eStatDoesntExist) + if (sinfo.fPCtqStatus==eStatDoesntExist) sinfo.direction=eSyncDelete; else sinfo.direction=eSyncPCToPDA; break; case eSyncNone: // means actually both directions! - if (sinfo.fPCStatus==eStatNew) { - if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncConflict; + if (sinfo.fPCtqStatus==eStatNew) { + if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncConflict; else sinfo.direction=eSyncPCToPDA; } else { - if (sinfo.fPalmStatus==eStatNew) sinfo.direction=eSyncPDAToPC; + if (sinfo.fPalmtqStatus==eStatNew) sinfo.direction=eSyncPDAToPC; else { sinfo.direction=eSyncNone; #ifdef DEBUG @@ -756,9 +756,9 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo) } // Text was included in the last sync - if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted; + if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCtqStatus=eStatDeleted; else if(pcTextChanged(sinfo.txtfilename)) { - sinfo.fPCStatus=eStatChanged; + sinfo.fPCtqStatus=eStatChanged; #ifdef DEBUG DEBUGKPILOT<<"PC side has changed!"<isOpen()) sinfo.fPalmStatus=eStatDeleted; + if (!docdb || !docdb->isOpen()) sinfo.fPalmtqStatus=eStatDeleted; else if (hhTextChanged(docdb)) { #ifdef DEBUG DEBUGKPILOT<<"Handheld side has changed!"<database(TQString::fromLatin1(dbinfo.name)); + return deviceLink()->database(TQString::tqfromLatin1(dbinfo.name)); } } @@ -950,7 +950,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database, if (DOCConduitSettings::keepPDBsLocally() && !DOCConduitSettings::localSync()) { PilotDatabase*db=deviceLink()->database( - TQString::fromLatin1(sinfo.dbinfo.name)); + TQString::tqfromLatin1(sinfo.dbinfo.name)); #ifdef DEBUG DEBUGKPILOT<<"Middle 1 Resetting sync flags for database " < #include -#include +#include #include #include #include @@ -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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + textLabel1->tqsetAlignment( 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->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + textLabel2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); topLayout->addWidget(textLabel2); resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page ); - TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox); + TQVBoxLayout*ptqlayout = new TQVBoxLayout(resolutionGroupBox); TQScrollView* sv = new TQScrollView(resolutionGroupBox); - playout->addWidget(sv); + ptqlayout->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->setAlignment( TQt::AlignTop ); + resolutionGroupBoxLayout->tqsetAlignment( TQt::AlignTop ); // Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f) TQButtonGroup *bgroup = new TQButtonGroup( this ); @@ -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->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, + cE.resolution->tqsetSizePolicy( 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(minimumSizeHint()) ); + resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) ); if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer"); if (tickleTimer) { @@ -150,7 +150,7 @@ ResolutionDialog::~ResolutionDialog() KDialogBase::slotOk(); } -TQString eTexStatusToString(eTexStatus stat) { +TQString eTexStatusToString(eTextqStatus stat) { switch(stat) { case eStatNone: return i18n("unchanged"); case eStatNew: return i18n("new"); @@ -168,9 +168,9 @@ void ResolutionDialog::slotInfo(int index) { int ix=cE.index; if (!syncInfo) return; docSyncInfo si=(*syncInfo)[ix]; - TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB); - text+=i18n("Handheld: %1\n").arg(eTexStatusToString(si.fPalmStatus)); - text+=i18n("Desktop: %1\n").arg(eTexStatusToString(si.fPCStatus)); + TQString text=i18n("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)); KMessageBox::information(this, text, i18n("Database information")); } diff --git a/conduits/docconduit/doc-setupdialog.ui b/conduits/docconduit/doc-setupdialog.ui index e04be16..e59025e 100644 --- a/conduits/docconduit/doc-setupdialog.ui +++ b/conduits/docconduit/doc-setupdialog.ui @@ -153,7 +153,7 @@ Expanding - + 20 20 @@ -222,7 +222,7 @@ Expanding - + 20 20 @@ -304,7 +304,7 @@ Expanding - + 20 20 @@ -492,7 +492,7 @@ Expanding - + 20 20 diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index 20e8d2f..58ca0aa 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(minimumSize()); + resize(tqminimumSize()); } ConverterDlg::~ConverterDlg() @@ -175,8 +175,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").tqarg(pdburl) + .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); @@ -191,7 +191,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("The folder %1 for " "the handheld database files is not a valid " - "folder.").arg(pdburl)); + "folder.").tqarg(pdburl)); return; } @@ -200,7 +200,7 @@ void ConverterDlg::slotToText() KMessageBox::sorry(this, i18n("The folder %1 for " "the handheld database files is not a " - "valid directory.").arg(pdburl)); + "valid directory.").tqarg(pdburl)); return; } @@ -211,8 +211,8 @@ void ConverterDlg::slotToText() int res=KMessageBox::questionYesNo(this, i18n("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").tqarg(txturl) + .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); txtinfo.setFile(txturl); @@ -227,7 +227,7 @@ void ConverterDlg::slotToText() if (!txtinfo.isDir()) { KMessageBox::sorry(this, i18n("The folder %1 for " - "the text files could not be created.").arg(txturl)); + "the text files could not be created.").tqarg(txturl)); return; } @@ -265,7 +265,7 @@ void ConverterDlg::slotToText() if (!pdbinfo.isFile() || !pdbinfo.exists()) { KMessageBox::sorry(this, i18n("The file %1 does not " - "exist.").arg(pdburl)); + "exist.").tqarg(pdburl)); return; } @@ -274,13 +274,13 @@ void ConverterDlg::slotToText() if (!txtinfo.isFile()) { KMessageBox::sorry(this, i18n("The filename %1 for the " - "text is not a valid filename.").arg(txturl)); + "text is not a valid filename.").tqarg(txturl)); return; }*/ if (convertPDBtoTXT(pdbinfo.dirPath(true), pdbinfo.fileName(), txtinfo.dirPath(true), txtinfo.fileName(), &conv) ) { - KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(pdburl)); + KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(pdburl)); } } @@ -324,8 +324,8 @@ void ConverterDlg::slotToPDB() int res=KMessageBox::questionYesNo(this, i18n("You selected to sync folders, " "but gave a filename instead (%1)." - "
Use folder %2 instead?").arg(txturl) - .arg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + "
Use folder %2 instead?").tqarg(txturl) + .tqarg(txtinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { txturl=txtinfo.dirPath(true); @@ -338,7 +338,7 @@ void ConverterDlg::slotToPDB() { KMessageBox::sorry(this, i18n("The folder %1 for " - "the text files is not a valid folder.").arg(txturl)); + "the text files is not a valid folder.").tqarg(txturl)); return; } @@ -350,8 +350,8 @@ void ConverterDlg::slotToPDB() i18n("You selected to sync folders, " "but gave a filename instead (%1)." "
Use folder %2 instead?") - .arg(pdburl) - .arg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); + .tqarg(pdburl) + .tqarg(pdbinfo.dirPath(true)), TQString(), i18n("Use Folder"), KStdGuiItem::cancel()); if (res==KMessageBox::Yes) { pdburl=pdbinfo.dirPath(true); pdbinfo.setFile(pdburl); @@ -365,7 +365,7 @@ void ConverterDlg::slotToPDB() } if (!pdbinfo.isDir()) { KMessageBox::sorry(this, i18n("The folder %1 for " - "the PalmDOC files could not be created.").arg(pdburl)); + "the PalmDOC files could not be created.").tqarg(pdburl)); return; } @@ -403,14 +403,14 @@ void ConverterDlg::slotToPDB() if (!txtinfo.isFile() || !txtinfo.exists()) { KMessageBox::sorry(this, i18n("The file %1 does not " - "exist.").arg(txturl)); + "exist.").tqarg(txturl)); return; } if (convertTXTtoPDB(txtinfo.dirPath(true), txtinfo.fileName(), pdbinfo.dirPath(true), pdbinfo.fileName(), &conv) ) { - KMessageBox::information(this, i18n("Conversion of file %1 successful.").arg(txturl)); + KMessageBox::information(this, i18n("Conversion of file %1 successful.").tqarg(txturl)); } } @@ -454,7 +454,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, if (!dbfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("The database file %1 already exists. Overwrite it?") - .arg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .tqarg(dbfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) { PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) @@ -479,7 +479,7 @@ bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile, } if ( !res && verbose ) { - KMessageBox::sorry(this, i18n("Error while converting the text %1.").arg(txtfile)); + KMessageBox::sorry(this, i18n("Error while converting the text %1.").tqarg(txtfile)); } } else @@ -499,7 +499,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, if (!txtfileinfo.exists() || !askOverwrite || (KMessageBox::Yes==KMessageBox::questionYesNo(this, i18n("The text file %1 already exists. Overwrite it?") - .arg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) + .tqarg(txtfileinfo.filePath()), TQString(), i18n("Overwrite"), KStdGuiItem::cancel() ) )) { PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false); if (pdbdb) @@ -515,7 +515,7 @@ bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile, } if ( !res && verbose ) { - KMessageBox::sorry(this, i18n("Error while converting the text %1.").arg(pdbfile)); + KMessageBox::sorry(this, i18n("Error while converting the text %1.").tqarg(pdbfile)); } } else diff --git a/conduits/docconduit/kpalmdoc_dlgbase.ui b/conduits/docconduit/kpalmdoc_dlgbase.ui index c693e90..9b92d8d 100644 --- a/conduits/docconduit/kpalmdoc_dlgbase.ui +++ b/conduits/docconduit/kpalmdoc_dlgbase.ui @@ -127,7 +127,7 @@ Expanding - + 20 16 @@ -181,7 +181,7 @@ Fixed - + 20 16 @@ -198,7 +198,7 @@ Fixed - + 20 16 @@ -215,7 +215,7 @@ Fixed - + 20 16 @@ -299,7 +299,7 @@ Expanding - + 21 200 @@ -329,7 +329,7 @@ Expanding - + 21 190 diff --git a/conduits/docconduit/pilotDOCEntry.h b/conduits/docconduit/pilotDOCEntry.h index 4ecaf19..679f35a 100644 --- a/conduits/docconduit/pilotDOCEntry.h +++ b/conduits/docconduit/pilotDOCEntry.h @@ -50,7 +50,7 @@ public: TQString getText() { fText.Decompress(); - return TQString::fromLatin1((const char *) fText.text()); + return TQString::tqfromLatin1((const char *) fText.text()); }; void setText(TQString newtext, bool compressed = false) { fText.setText((const unsigned char *) newtext.latin1(), -- cgit v1.2.1