summaryrefslogtreecommitdiffstats
path: root/kpilot/conduits/docconduit
diff options
context:
space:
mode:
Diffstat (limited to 'kpilot/conduits/docconduit')
-rw-r--r--kpilot/conduits/docconduit/DOC-converter.cc88
-rw-r--r--kpilot/conduits/docconduit/DOC-converter.h60
-rw-r--r--kpilot/conduits/docconduit/doc-conduit.cc156
-rw-r--r--kpilot/conduits/docconduit/doc-conduit.h30
-rw-r--r--kpilot/conduits/docconduit/doc-conflictdialog.cc72
-rw-r--r--kpilot/conduits/docconduit/doc-conflictdialog.h18
-rw-r--r--kpilot/conduits/docconduit/doc-factory.cc8
-rw-r--r--kpilot/conduits/docconduit/doc-factory.h8
-rw-r--r--kpilot/conduits/docconduit/doc-setup.cc22
-rw-r--r--kpilot/conduits/docconduit/doc-setup.h2
-rw-r--r--kpilot/conduits/docconduit/kpalmdoc_dlg.cc90
-rw-r--r--kpilot/conduits/docconduit/kpalmdoc_dlg.h10
-rw-r--r--kpilot/conduits/docconduit/pilotDOCEntry.h6
13 files changed, 285 insertions, 285 deletions
diff --git a/kpilot/conduits/docconduit/DOC-converter.cc b/kpilot/conduits/docconduit/DOC-converter.cc
index c8d7ac02d..6502fe54e 100644
--- a/kpilot/conduits/docconduit/DOC-converter.cc
+++ b/kpilot/conduits/docconduit/DOC-converter.cc
@@ -30,10 +30,10 @@
#include "options.h"
#include "DOC-converter.moc"
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qsortedlist.h>
+#include <tqdir.h>
+#include <tqfileinfo.h>
+#include <tqregexp.h>
+#include <tqsortedlist.h>
#include <pilotDatabase.h>
#include <pilotLocalDatabase.h>
@@ -50,7 +50,7 @@
/****************************************************************************************************
- * various bookmark classes. Most important is the bmkList findMatches(QString) function,
+ * various bookmark classes. Most important is the bmkList findMatches(TQString) function,
* which needs to return a list of all bookmarks found for the given bookmark expression.
* A bookmark usually consists of a bookmark text and an offset into the text document.
****************************************************************************************************/
@@ -70,7 +70,7 @@ bool operator== ( const docBookmark &s1, const docBookmark &s2)
}
-int docMatchBookmark::findMatches(QString doctext, bmkList &fBookmarks) {
+int docMatchBookmark::findMatches(TQString doctext, bmkList &fBookmarks) {
FUNCTIONSETUP;
// bmkList res;
int pos = 0, nr=0, found=0;
@@ -99,11 +99,11 @@ int docMatchBookmark::findMatches(QString doctext, bmkList &fBookmarks) {
-int docRegExpBookmark::findMatches(QString doctext, bmkList &fBookmarks)
+int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks)
{
FUNCTIONSETUP;
// bmkList res;
- QRegExp rx(pattern);
+ TQRegExp rx(pattern);
int pos = 0, nr=0, found=0;
while (pos>=0 && found<=to) {
@@ -118,7 +118,7 @@ int docRegExpBookmark::findMatches(QString doctext, bmkList &fBookmarks)
fBookmarks.append(new docBookmark(/*bmkName.left(16)*/rx.cap(capSubexpression), pos));
} else {
// TODO: use the subexpressions from the regexp for the bmk name ($1..$9) (given as separate regexp)
- QString bmkText(bmkName);
+ 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));
@@ -145,7 +145,7 @@ int docRegExpBookmark::findMatches(QString doctext, bmkList &fBookmarks)
*********************************************************************/
-DOCConverter::DOCConverter(QObject *parent, const char *name):QObject(parent,name) {
+DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) {
FUNCTIONSETUP;
docdb=0L;
eSortBookmarks=eSortNone;
@@ -168,16 +168,16 @@ DOCConverter::~DOCConverter() {
-void DOCConverter::setTXTpath(QString path, QString file) {
- QDir dr(path);
- QFileInfo pth(dr, file);
+void DOCConverter::setTXTpath(TQString path, TQString file) {
+ TQDir dr(path);
+ TQFileInfo pth(dr, file);
if (!file.isEmpty())
txtfilename = pth.absFilePath();
}
-void DOCConverter::setTXTpath(QString filename) {
+void DOCConverter::setTXTpath(TQString filename) {
if (!filename.isEmpty()) txtfilename = filename;
}
@@ -189,26 +189,26 @@ void DOCConverter::setPDB(PilotDatabase * dbi) {
-QString DOCConverter::readText() {
+TQString DOCConverter::readText() {
FUNCTIONSETUP;
- if (txtfilename.isEmpty()) return QString();
- QFile docfile(txtfilename);
+ if (txtfilename.isEmpty()) return TQString();
+ TQFile docfile(txtfilename);
if (!docfile.open(IO_ReadOnly))
{
emit logError(i18n("Unable to open text file %1 for reading.").arg(txtfilename));
- return QString();
+ return TQString();
}
- QTextStream docstream(&docfile);
+ TQTextStream docstream(&docfile);
- QString doc = docstream.read();
+ TQString doc = docstream.read();
docfile.close();
return doc;
}
-int DOCConverter::findBmkEndtags(QString &text, bmkList&fBmks) {
+int DOCConverter::findBmkEndtags(TQString &text, bmkList&fBmks) {
FUNCTIONSETUP;
// Start from the end of the text
int pos = text.length() - 1, nr=0;
@@ -256,11 +256,11 @@ int DOCConverter::findBmkEndtags(QString &text, bmkList&fBmks) {
return nr;
}
-int DOCConverter::findBmkInline(QString &text, bmkList &fBmks) {
+int DOCConverter::findBmkInline(TQString &text, bmkList &fBmks) {
FUNCTIONSETUP;
// bmkList res;
int nr=0;
- QRegExp rx(CSL1("<\\*(.*)\\*>"));
+ TQRegExp rx(CSL1("<\\*(.*)\\*>"));
rx.setMinimal(TRUE);
int pos = 0;
@@ -275,17 +275,17 @@ int DOCConverter::findBmkInline(QString &text, bmkList &fBmks) {
return nr;
}
-int DOCConverter::findBmkFile(QString &, bmkList &fBmks) {
+int DOCConverter::findBmkFile(TQString &, bmkList &fBmks) {
FUNCTIONSETUP;
int nr=0;
- QString bmkfilename = txtfilename;
+ TQString bmkfilename = txtfilename;
if (bmkfilename.endsWith(CSL1(".txt"))){
bmkfilename.remove(bmkfilename.length()-4, 4);
}
- QString oldbmkfilename=bmkfilename;
+ TQString oldbmkfilename=bmkfilename;
bmkfilename+=CSL1(BMK_SUFFIX);
- QFile bmkfile(bmkfilename);
+ TQFile bmkfile(bmkfilename);
if (!bmkfile.open(IO_ReadOnly)) {
bmkfilename=oldbmkfilename+CSL1(PDBBMK_SUFFIX);
bmkfile.setName(bmkfilename);
@@ -297,11 +297,11 @@ int DOCConverter::findBmkFile(QString &, bmkList &fBmks) {
DEBUGKPILOT<<"Bookmark file: "<<bmkfilename<<endl;
- QTextStream bmkstream(&bmkfile);
- QString line;
+ TQTextStream bmkstream(&bmkfile);
+ TQString line;
while ( !(line=bmkstream.readLine()).isEmpty() ) {
if (!line.isEmpty() && !line.startsWith(CSL1("#")) ) {
- QStringList bmkinfo=QStringList::split(CSL1(","), line);
+ TQStringList bmkinfo=TQStringList::split(CSL1(","), line);
int fieldnr=bmkinfo.count();
// We use the same syntax for the entries as MakeDocJ bookmark files:
// <bookmark>,<string-to-search>,<bookmark-name-string>,<starting-bookmark>,<ending-bookmark>
@@ -309,19 +309,19 @@ int DOCConverter::findBmkFile(QString &, bmkList &fBmks) {
if (fieldnr>0){
DEBUGKPILOT<<"Working on bookmark \""<<line<<"\""<<endl;
docMatchBookmark*bmk=0L;
- QString bookmark=bmkinfo[0];
+ TQString bookmark=bmkinfo[0];
bool ok;
int pos=bookmark.toInt(&ok);
if (ok) {
if (fieldnr>1) {
- QString name(bmkinfo[1]);
+ TQString name(bmkinfo[1]);
DEBUGKPILOT<<"Bookmark \""<<name<<"\" set at position "<<pos<<endl;
fBmks.append(new docBookmark(name, pos));
}
} else if (bookmark==CSL1("-") || bookmark==CSL1("+")) {
if (fieldnr>1) {
- QString patt(bmkinfo[1]);
- QString name(patt);
+ TQString patt(bmkinfo[1]);
+ TQString name(patt);
if (fieldnr>2) {
int cap=bmkinfo[2].toInt(&ok);
if (ok) {
@@ -359,7 +359,7 @@ int DOCConverter::findBmkFile(QString &, bmkList &fBmks) {
DEBUGKPILOT<<"RegExp bookmark found with no other information (no bookmark pattern nor name)"<<endl;
}
} else {
- QString pattern(bookmark);
+ TQString pattern(bookmark);
if (fieldnr>1) pattern=bmkinfo[1];
if (fieldnr>2) bookmark=bmkinfo[2];
DEBUGKPILOT<<"RegExp Bookmark, pattern="<<pattern<<", name="<<bookmark<<endl;
@@ -384,7 +384,7 @@ bool DOCConverter::convertTXTtoPDB() {
return false;
}
- QString text = readText();
+ TQString text = readText();
if (fBmkTypes & eBmkEndtags) {
findBmkEndtags(text, fBookmarks);
@@ -537,14 +537,14 @@ bool DOCConverter::convertPDBtoTXT()
<<" version="<<header.version<<endl;
// next come the header.numRecords real document records (might be compressed, see the version flag in the header)
- QFile docfile(txtfilename);
+ TQFile docfile(txtfilename);
if (!docfile.open(IO_WriteOnly))
{
emit logError(i18n("Unable to open output file %1.").arg(txtfilename));
KPILOT_DELETE(docdb);
return false;
}
- QString doctext;
+ TQString doctext;
for (int i=1; i<header.numRecords+1; ++i)
{
PilotRecord*rec=docdb->readRecordByIndex(i);
@@ -570,7 +570,7 @@ bool DOCConverter::convertPDBtoTXT()
if (rec)
{
PilotDOCBookmark bookie(rec);
- docBookmark*bmk=new docBookmark(QString::fromLatin1(bookie.bookmarkName), bookie.pos);
+ docBookmark*bmk=new docBookmark(TQString::fromLatin1(bookie.bookmarkName), bookie.pos);
bmks.append(bmk);
KPILOT_DELETE(rec);
} else {
@@ -583,12 +583,12 @@ bool DOCConverter::convertPDBtoTXT()
if ((fBmkTypes & eBmkFile) && (bmks.count()>0))
{
- QString bmkfilename = docfile.name();
+ TQString bmkfilename = docfile.name();
if (bmkfilename.endsWith(CSL1(".txt"))){
bmkfilename.remove(bmkfilename.length()-4, 4);
}
bmkfilename+=CSL1(PDBBMK_SUFFIX);
- QFile bmkfile(bmkfilename);
+ TQFile bmkfile(bmkfilename);
if (!bmkfile.open(IO_WriteOnly))
{
emit logError(i18n("Unable to open file %1 for the bookmarks of %2.")
@@ -598,7 +598,7 @@ bool DOCConverter::convertPDBtoTXT()
{
DEBUGKPILOT<<"Writing "<<upperBmkRec-header.numRecords<<
"("<<upperBmkRec<<") bookmarks to file "<<bmkfilename<<endl;
- QTextStream bmkstream(&bmkfile);
+ TQTextStream bmkstream(&bmkfile);
for (docBookmark*bmk=bmks.first(); bmk; bmk=bmks.next())
{
bmkstream<<bmk->position<<", "<<bmk->bmkName<<endl;
@@ -611,14 +611,14 @@ bool DOCConverter::convertPDBtoTXT()
{
for (docBookmark*bmk=bmks.last(); bmk; bmk=bmks.prev())
{
- doctext.insert(bmk->position, QString(CSL1("<*") +
+ doctext.insert(bmk->position, TQString(CSL1("<*") +
bmk->bmkName +
CSL1("*>")));
}
}
// Finally, write the actual text out to the file.
- QTextStream docstream(&docfile);
+ TQTextStream docstream(&docfile);
docstream<<doctext;
//docstream.close();
docfile.close();
diff --git a/kpilot/conduits/docconduit/DOC-converter.h b/kpilot/conduits/docconduit/DOC-converter.h
index f3747ea1d..802d60f20 100644
--- a/kpilot/conduits/docconduit/DOC-converter.h
+++ b/kpilot/conduits/docconduit/DOC-converter.h
@@ -36,51 +36,51 @@
#define BMK_SUFFIX ".bmk"
#define PDBBMK_SUFFIX ".bm"
-#include <qptrlist.h>
-#include <qobject.h>
+#include <tqptrlist.h>
+#include <tqobject.h>
class PilotDatabase;
/****************************************************************************************************
- * various bookmark classes. Most important is the bmkList findMatches(QString, bmkList &) function,
+ * various bookmark classes. Most important is the bmkList findMatches(TQString, bmkList &) function,
* which needs to return a list of all bookmarks found for the given bookmark expression.
* A bookmark usually consists of a bookmark text and an offset into the text document.
****************************************************************************************************/
class docBookmark;
-#define bmkList QPtrList<docBookmark>
-#define bmkSortedList QSortedList<docBookmark>
+#define bmkList TQPtrList<docBookmark>
+#define bmkSortedList TQSortedList<docBookmark>
class docBookmark {
public:
static bool compare_pos;
docBookmark():bmkName(), position(0) { };
- docBookmark(QString name, long int pos):bmkName(name), position(pos) { };
+ docBookmark(TQString name, long int pos):bmkName(name), position(pos) { };
docBookmark(const docBookmark &bmk):bmkName(bmk.bmkName),position(bmk.position){};
virtual ~ docBookmark() { };
- virtual int findMatches(QString, bmkList &fBookmarks) {
+ virtual int findMatches(TQString, bmkList &fBookmarks) {
FUNCTIONSETUP;
fBookmarks.append(new docBookmark(*this));
return 1;
};
- QString bmkName;
+ TQString bmkName;
long int position;
};
class docMatchBookmark:public docBookmark {
public:
docMatchBookmark():docBookmark() { from=0; to=100;};
- docMatchBookmark(QString pattrn, int options=0):docBookmark(),
+ docMatchBookmark(TQString pattrn, int options=0):docBookmark(),
pattern(pattrn), opts(options) { from=0; to=100; };
- docMatchBookmark(QString pattrn, QString bmkname,
+ docMatchBookmark(TQString pattrn, TQString bmkname,
int options=0):docBookmark(bmkname, 0), pattern(pattrn),
opts(options) { from=0; to=100; };
virtual ~ docMatchBookmark() { };
- virtual int findMatches(QString, bmkList &fBookmarks);
- QString pattern;
+ virtual int findMatches(TQString, bmkList &fBookmarks);
+ TQString pattern;
int opts;
int from, to;
};
@@ -88,13 +88,13 @@ class docMatchBookmark:public docBookmark {
class docRegExpBookmark:public docMatchBookmark {
public:
docRegExpBookmark():docMatchBookmark() { capSubexpression=-1;};
- docRegExpBookmark(QString regexp, int cap=0,
+ docRegExpBookmark(TQString regexp, int cap=0,
int options=0):docMatchBookmark(regexp, options) {capSubexpression=cap; };
- docRegExpBookmark(QString pattrn, QString bmkname,
+ docRegExpBookmark(TQString pattrn, TQString bmkname,
int options=0):docMatchBookmark(pattrn, bmkname, options) { capSubexpression=-1; };
virtual ~ docRegExpBookmark() { };
- virtual int findMatches(QString, bmkList &fBookmarks);
+ virtual int findMatches(TQString, bmkList &fBookmarks);
int capSubexpression;
};
@@ -103,12 +103,12 @@ class docRegExpBookmark:public docMatchBookmark {
* The converter class that does the real work for us.
*************************************************************************************************************/
-class DOCConverter:public QObject {
+class DOCConverter:public TQObject {
Q_OBJECT
private:
PilotDatabase * docdb;
- QString txtfilename;
- QString bmkfilename;
+ TQString txtfilename;
+ TQString bmkfilename;
bool compress;
bmkList fBookmarks;
@@ -121,16 +121,16 @@ public:
} eSortBookmarks;
public:
- DOCConverter(QObject *parent=0L, const char *name=0L);
+ DOCConverter(TQObject *parent=0L, const char *name=0L);
virtual ~ DOCConverter();
- QString readText();
- void setTXTpath(QString path, QString file);
- void setTXTpath(QString filename);
+ TQString readText();
+ void setTXTpath(TQString path, TQString file);
+ void setTXTpath(TQString filename);
void setPDB(PilotDatabase * dbi);
- QString txtFilename() const {return txtfilename;}
- QString bmkFilename() const {return bmkfilename;}
- void setBmkFilename(QString bmkf) { bmkfilename=bmkf;}
+ TQString txtFilename() const {return txtfilename;}
+ TQString bmkFilename() const {return bmkfilename;}
+ void setBmkFilename(TQString bmkf) { bmkfilename=bmkf;}
bool getCompress() const { return compress; };
void setCompress(bool newcomp) {compress=newcomp;};
@@ -151,9 +151,9 @@ public:
return fBookmarks.count();
};
- int findBmkEndtags(QString &, bmkList&);
- int findBmkInline(QString &, bmkList&);
- int findBmkFile(QString &, bmkList&);
+ int findBmkEndtags(TQString &, bmkList&);
+ int findBmkInline(TQString &, bmkList&);
+ int findBmkFile(TQString &, bmkList&);
void setSort(enum eSortBookmarksEnum sort) {eSortBookmarks=sort;}
@@ -176,8 +176,8 @@ protected:
private:
void readConfig();
signals:
- void logMessage(const QString &);
- void logError(const QString &);
+ void logMessage(const TQString &);
+ void logError(const TQString &);
};
#endif
diff --git a/kpilot/conduits/docconduit/doc-conduit.cc b/kpilot/conduits/docconduit/doc-conduit.cc
index eee36080c..fbaa22f59 100644
--- a/kpilot/conduits/docconduit/doc-conduit.cc
+++ b/kpilot/conduits/docconduit/doc-conduit.cc
@@ -36,8 +36,8 @@
#include "options.h"
#include "doc-conduit.moc"
-#include <qtimer.h>
-#include <qdir.h>
+#include <tqtimer.h>
+#include <tqdir.h>
#include <kconfig.h>
#include <kmdcodec.h>
@@ -59,7 +59,7 @@ extern "C"
unsigned long version_conduit_doc = Pilot::PLUGIN_API;
}
-QString dirToString(eSyncDirectionEnum dir) {
+TQString dirToString(eSyncDirectionEnum dir) {
switch(dir) {
// case eSyncAll: return "eSyncAll";
case eSyncPDAToPC: return CSL1("eSyncPDAToPC");
@@ -78,7 +78,7 @@ QString dirToString(eSyncDirectionEnum dir) {
DOCConduit::DOCConduit(KPilotLink * o,
- const char *n, const QStringList & a):ConduitAction(o, n, a)
+ const char *n, const TQStringList & a):ConduitAction(o, n, a)
{
FUNCTIONSETUP;
fConduitName=i18n("DOC");
@@ -145,13 +145,13 @@ void DOCConduit::readConfig()
-bool DOCConduit::pcTextChanged(QString txtfn)
+bool DOCConduit::pcTextChanged(TQString txtfn)
{
FUNCTIONSETUP;
// How do I find out if a text file has changed shince we last synced it??
// Use KMD5 for now. If I realize it is too slow, then I have to go back to comparing modification times
// if there is no config setting yet, assume the file has been changed. the md5 sum will be written to the config file after the sync.
- QString oldDigest=DOCConduitSettings::self()->config()->readEntry(txtfn);
+ TQString oldDigest=DOCConduitSettings::self()->config()->readEntry(txtfn);
if (oldDigest.length()<=0)
{
return true;
@@ -161,10 +161,10 @@ bool DOCConduit::pcTextChanged(QString txtfn)
#endif
KMD5 docmd5;
- QFile txtfile(txtfn);
+ TQFile txtfile(txtfn);
if (txtfile.open(IO_ReadOnly)){
docmd5.update(txtfile);
- QString thisDigest(docmd5.hexDigest() /* .data() */);
+ TQString thisDigest(docmd5.hexDigest() /* .data() */);
#ifdef DEBUG
DEBUGKPILOT<<"New digest is "<<thisDigest<<endl;
#endif
@@ -233,19 +233,19 @@ bool DOCConduit::hhTextChanged(PilotDatabase*docdb)
* Helper functions
********************************************************************/
-QString DOCConduit::constructPDBFileName(QString name) {
+TQString DOCConduit::constructPDBFileName(TQString name) {
FUNCTIONSETUP;
- QString fn;
- QDir dr(DOCConduitSettings::pDBDirectory());
- QFileInfo pth(dr, name);
+ TQString fn;
+ TQDir dr(DOCConduitSettings::pDBDirectory());
+ TQFileInfo pth(dr, name);
if (!name.isEmpty()) fn=pth.absFilePath()+CSL1(".pdb");
return fn;
}
-QString DOCConduit::constructTXTFileName(QString name) {
+TQString DOCConduit::constructTXTFileName(TQString name) {
FUNCTIONSETUP;
- QString fn;
- QDir dr( DOCConduitSettings::tXTDirectory() );
- QFileInfo pth(dr, name);
+ TQString fn;
+ TQDir dr( DOCConduitSettings::tXTDirectory() );
+ TQFileInfo pth(dr, name);
if (!name.isEmpty()) fn=pth.absFilePath()+CSL1(".txt");
return fn;
}
@@ -271,7 +271,7 @@ QString DOCConduit::constructTXTFileName(QString name) {
emit logMessage(i18n("Searching for texts and databases to synchronize"));
- QTimer::singleShot(0, this, SLOT(syncNextDB()));
+ TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return true;
}
@@ -284,15 +284,15 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (sinfo.direction==eSyncDelete) {
if (!sinfo.txtfilename.isEmpty()) {
- if (!QFile::remove(sinfo.txtfilename)) {
+ if (!TQFile::remove(sinfo.txtfilename)) {
WARNINGKPILOT << "Unable to delete the text file " << sinfo.txtfilename << " on the PC" << endl;
}
- QString bmkfilename = sinfo.txtfilename;
+ TQString bmkfilename = sinfo.txtfilename;
if (bmkfilename.endsWith(CSL1(".txt"))){
bmkfilename.remove(bmkfilename.length()-4, 4);
}
bmkfilename+=CSL1(PDBBMK_SUFFIX);
- if (!QFile::remove(bmkfilename)) {
+ if (!TQFile::remove(bmkfilename)) {
#ifdef DEBUG
DEBUGKPILOT<<"Could not remove bookmarks file "<<bmkfilename<<" for database "<<sinfo.handheldDB<<endl;
#endif
@@ -300,7 +300,7 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
}
if (!sinfo.pdbfilename.isEmpty() && DOCConduitSettings::keepPDBsLocally() ) {
PilotLocalDatabase*database=new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
- QString::fromLatin1(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;
@@ -336,8 +336,8 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (database && database->isOpen()) {
DOCConverter docconverter;
- connect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &)));
- connect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &)));
+ connect(&docconverter, TQT_SIGNAL(logError(const TQString &)), TQT_SIGNAL(logError(const TQString &)));
+ connect(&docconverter, TQT_SIGNAL(logMessage(const TQString &)), TQT_SIGNAL(logMessage(const TQString &)));
docconverter.setTXTpath( DOCConduitSettings::tXTDirectory(), sinfo.txtfilename );
docconverter.setPDB(database);
@@ -360,10 +360,10 @@ bool DOCConduit::doSync(docSyncInfo &sinfo)
if (res)
{
KMD5 docmd5;
- QFile txtfile(docconverter.txtFilename());
+ TQFile txtfile(docconverter.txtFilename());
if (txtfile.open(IO_ReadOnly)) {
docmd5.update(txtfile);
- QString thisDigest(docmd5.hexDigest() /* .data() */);
+ TQString thisDigest(docmd5.hexDigest() /* .data() */);
DOCConduitSettings::self()->config()->writeEntry(docconverter.txtFilename(), thisDigest);
DOCConduitSettings::self()->config()->sync();
#ifdef DEBUG
@@ -378,18 +378,18 @@ 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(QString::fromLatin1(sinfo.dbinfo.name)));
+ .arg(TQString::fromLatin1(sinfo.dbinfo.name)));
if (!res)
emit logError(i18n("Conversion of PalmDOC \"%1\" failed.")
- .arg(QString::fromLatin1(sinfo.dbinfo.name)));
-// disconnect(&docconverter, SIGNAL(logError(const QString &)), SIGNAL(logError(const QString &)));
-// disconnect(&docconverter, SIGNAL(logMessage(const QString &)), SIGNAL(logMessage(const QString &)));
+ .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);
}
else
{
emit logError(i18n("Unable to open or create the database %1.")
- .arg(QString::fromLatin1(sinfo.dbinfo.name)));
+ .arg(TQString::fromLatin1(sinfo.dbinfo.name)));
}
return res;
}
@@ -404,7 +404,7 @@ void DOCConduit::syncNextDB() {
if (eSyncDirection==eSyncPCToPDA || fHandle->findDatabase(NULL, &dbinfo, dbnr, dbtype(), dbcreator() /*, cardno */ ) < 0)
{
// no more databases available, so check for PC->Palm sync
- QTimer::singleShot(0, this, SLOT(syncNextTXT()));
+ TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
return;
}
dbnr=dbinfo.index+1;
@@ -414,23 +414,23 @@ void DOCConduit::syncNextDB() {
// if creator and/or type don't match, go to next db
if (!isCorrectDBTypeCreator(dbinfo) ||
- fDBNames.contains(QString::fromLatin1(dbinfo.name)))
+ fDBNames.contains(TQString::fromLatin1(dbinfo.name)))
{
- QTimer::singleShot(0, this, SLOT(syncNextDB()));
+ TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
}
- QString txtfilename=constructTXTFileName(QString::fromLatin1(dbinfo.name));
- QString pdbfilename=constructPDBFileName(QString::fromLatin1(dbinfo.name));
+ TQString txtfilename=constructTXTFileName(TQString::fromLatin1(dbinfo.name));
+ TQString pdbfilename=constructPDBFileName(TQString::fromLatin1(dbinfo.name));
- docSyncInfo syncInfo(QString::fromLatin1(dbinfo.name),
+ docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
syncInfo.dbinfo=dbinfo;
needsSync(syncInfo);
fSyncInfoList.append(syncInfo);
- fDBNames.append(QString::fromLatin1(dbinfo.name));
+ fDBNames.append(TQString::fromLatin1(dbinfo.name));
- QTimer::singleShot(0, this, SLOT(syncNextDB()));
+ TQTimer::singleShot(0, this, TQT_SLOT(syncNextDB()));
return;
}
@@ -444,28 +444,28 @@ void DOCConduit::syncNextTXT()
{
// We don't sync from PC to PDB, so start the conflict resolution and then the actual sync process
docnames.clear();
- QTimer::singleShot(0, this, SLOT(checkPDBFiles()));
+ TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
return;
}
// if docnames isn't initialized, get a list of all *.txt files in DOCConduitSettings::tXTDirectory()
if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
- docnames=QDir( DOCConduitSettings::tXTDirectory(), CSL1("*.txt")).entryList() ;
+ docnames=TQDir( DOCConduitSettings::tXTDirectory(), CSL1("*.txt")).entryList() ;
dociterator=docnames.begin();
}
if (dociterator==docnames.end()) {
// no more databases available, so start the conflict resolution and then the actual sync proces
docnames.clear();
- QTimer::singleShot(0, this, SLOT(checkPDBFiles()));
+ TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
return;
}
- QString fn=(*dociterator);
+ TQString fn=(*dociterator);
- QDir dr( DOCConduitSettings::tXTDirectory() );
- QFileInfo fl(dr, fn );
- QString txtfilename=fl.absFilePath();
- QString pdbfilename;
+ TQDir dr( DOCConduitSettings::tXTDirectory() );
+ TQFileInfo fl(dr, fn );
+ TQString txtfilename=fl.absFilePath();
+ TQString pdbfilename;
++dociterator;
DBInfo dbinfo;
@@ -476,19 +476,19 @@ void DOCConduit::syncNextTXT()
bool alreadySynced=fDBNames.contains(fl.baseName(TRUE));
if (!alreadySynced) {
- docSyncInfo syncInfo(QString::fromLatin1(dbinfo.name),
+ docSyncInfo syncInfo(TQString::fromLatin1(dbinfo.name),
txtfilename, pdbfilename, eSyncNone);
syncInfo.dbinfo=dbinfo;
needsSync(syncInfo);
fSyncInfoList.append(syncInfo);
- fDBNames.append(QString::fromLatin1(dbinfo.name));
+ fDBNames.append(TQString::fromLatin1(dbinfo.name));
} else {
#ifdef DEBUG
DEBUGKPILOT<<txtfilename<<" has already been synced, skipping it."<<endl;
#endif
}
- QTimer::singleShot(0, this, SLOT(syncNextTXT()));
+ TQTimer::singleShot(0, this, TQT_SLOT(syncNextTXT()));
return;
}
@@ -502,33 +502,33 @@ void DOCConduit::checkPDBFiles() {
if ( DOCConduitSettings::localSync() || !DOCConduitSettings::keepPDBsLocally() || eSyncDirection==eSyncPCToPDA )
{
// no more databases available, so check for PC->Palm sync
- QTimer::singleShot(0, this, SLOT(checkDeletedDocs()));
+ TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
return;
}
// Walk through all files in the pdb directory and check if it has already been synced.
// if docnames isn't initialized, get a list of all *.pdb files in DOCConduitSettings::pDBDirectory()
if (docnames.isEmpty()/* || dociterator==docnames.end() */) {
- docnames=QDir(DOCConduitSettings::pDBDirectory(), CSL1("*.pdb")).entryList() ;
+ docnames=TQDir(DOCConduitSettings::pDBDirectory(), CSL1("*.pdb")).entryList() ;
dociterator=docnames.begin();
}
if (dociterator==docnames.end()) {
// no more databases available, so start the conflict resolution and then the actual sync proces
docnames.clear();
- QTimer::singleShot(0, this, SLOT(checkDeletedDocs()));
+ TQTimer::singleShot(0, this, TQT_SLOT(checkDeletedDocs()));
return;
}
- QString fn=(*dociterator);
+ TQString fn=(*dociterator);
- QDir dr(DOCConduitSettings::pDBDirectory());
- QFileInfo fl(dr, fn );
- QString pdbfilename=fl.absFilePath();
+ TQDir dr(DOCConduitSettings::pDBDirectory());
+ TQFileInfo fl(dr, fn );
+ TQString pdbfilename=fl.absFilePath();
++dociterator;
// Get the doc title and check if it has already been synced (in the synced docs list of in fDBNames to be synced)
// If the doc title doesn't appear in either list, install it to the Handheld, and add it to the list of dbs to be synced.
- QString dbname=fl.baseName(TRUE).left(30);
+ TQString dbname=fl.baseName(TRUE).left(30);
if (!fDBNames.contains(dbname) && !fDBListSynced.contains(dbname)) {
if (fHandle->installFiles(pdbfilename, false)) {
DBInfo dbinfo;
@@ -549,7 +549,7 @@ void DOCConduit::checkPDBFiles() {
}
}
- QTimer::singleShot(0, this, SLOT(checkPDBFiles()));
+ TQTimer::singleShot(0, this, TQT_SLOT(checkPDBFiles()));
}
@@ -558,12 +558,12 @@ void DOCConduit::checkDeletedDocs()
{
FUNCTIONSETUP;
- for (QStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) {
+ for (TQStringList::Iterator it=fDBListSynced.begin(); it!=fDBListSynced.end(); ++it ) {
if (!fDBNames.contains(*it)) {
// We need to delete this doc:
- QString dbname(*it);
- QString txtfilename=constructTXTFileName(dbname);
- QString pdbfilename=constructPDBFileName(dbname);
+ TQString dbname(*it);
+ TQString txtfilename=constructTXTFileName(dbname);
+ TQString pdbfilename=constructPDBFileName(dbname);
docSyncInfo syncInfo(dbname, txtfilename, pdbfilename, eSyncDelete);
DBInfo dbinfo;
@@ -574,7 +574,7 @@ void DOCConduit::checkDeletedDocs()
fSyncInfoList.append(syncInfo);
}
}
- QTimer::singleShot(0, this, SLOT(resolve()));
+ TQTimer::singleShot(0, this, TQT_SLOT(resolve()));
return;
}
@@ -628,7 +628,7 @@ void DOCConduit::resolve() {
if (!dlg || !dlg->exec() ) {
KPILOT_DELETE(dlg)
emit logMessage(i18n("Sync aborted by user."));
- QTimer::singleShot(0, this, SLOT(cleanup()));
+ TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
return;
}
}
@@ -638,7 +638,7 @@ void DOCConduit::resolve() {
// fDBNames will be filled with the names of the databases that are actually synced (not deleted), so I can write the list to the config file
fDBNames.clear();
fSyncInfoListIterator=fSyncInfoList.begin();
- QTimer::singleShot(0,this, SLOT(syncDatabases()));
+ TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
return;
}
@@ -648,7 +648,7 @@ void DOCConduit::syncDatabases() {
FUNCTIONSETUP;
if (fSyncInfoListIterator==fSyncInfoList.end()) {
// We're done, so clean up
- QTimer::singleShot(0, this, SLOT(cleanup()));
+ TQTimer::singleShot(0, this, TQT_SLOT(cleanup()));
return;
}
@@ -679,12 +679,12 @@ void DOCConduit::syncDatabases() {
}
if (sinfo.direction != eSyncDelete) fDBNames.append(sinfo.handheldDB);
- QTimer::singleShot(0,this, SLOT(syncDatabases()));
+ TQTimer::singleShot(0,this, TQT_SLOT(syncDatabases()));
return;
}
-PilotDatabase*DOCConduit::openDOCDatabase(const QString &dbname) {
+PilotDatabase*DOCConduit::openDOCDatabase(const TQString &dbname) {
if (DOCConduitSettings::localSync())
{
return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(), dbname, false);
@@ -701,7 +701,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
FUNCTIONSETUP;
sinfo.direction = eSyncNone;
- PilotDatabase*docdb=openDOCDatabase(QString::fromLatin1(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,7 +716,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
N N | C P H
*/
- if (QFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
+ if (TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatNew;
else sinfo.fPCStatus=eStatDoesntExist;
if (docdb && docdb->isOpen()) sinfo.fPalmStatus=eStatNew;
else sinfo.fPalmStatus=eStatDoesntExist;
@@ -756,7 +756,7 @@ bool DOCConduit::needsSync(docSyncInfo &sinfo)
}
// Text was included in the last sync
- if (!QFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted;
+ if (!TQFile::exists(sinfo.txtfilename)) sinfo.fPCStatus=eStatDeleted;
else if(pcTextChanged(sinfo.txtfilename)) {
sinfo.fPCStatus=eStatChanged;
#ifdef DEBUG
@@ -871,7 +871,7 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
{
// make sure the dir for the local texts really exists!
- QDir dir( DOCConduitSettings::tXTDirectory() );
+ TQDir dir( DOCConduitSettings::tXTDirectory() );
if (!dir.exists())
{
dir.mkdir(dir.absPath());
@@ -885,7 +885,7 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
if (DOCConduitSettings::keepPDBsLocally())
{
// make sure the dir for the local db really exists!
- QDir dir(DOCConduitSettings::pDBDirectory());
+ TQDir dir(DOCConduitSettings::pDBDirectory());
if (!dir.exists())
{
@@ -909,7 +909,7 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
if (DOCConduitSettings::keepPDBsLocally())
{
// make sure the dir for the local db really exists!
- QDir dir(DOCConduitSettings::pDBDirectory());
+ TQDir dir(DOCConduitSettings::pDBDirectory());
if (!dir.exists())
{
dir.mkdir(dir.absPath());
@@ -922,11 +922,11 @@ PilotDatabase *DOCConduit::preSyncAction(docSyncInfo &sinfo) const
if (DOCConduitSettings::keepPDBsLocally())
{
return new PilotLocalDatabase(DOCConduitSettings::pDBDirectory(),
- QString::fromLatin1(dbinfo.name), false);
+ TQString::fromLatin1(dbinfo.name), false);
}
else
{
- return deviceLink()->database(QString::fromLatin1(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(
- QString::fromLatin1(sinfo.dbinfo.name));
+ TQString::fromLatin1(sinfo.dbinfo.name));
#ifdef DEBUG
DEBUGKPILOT<<"Middle 1 Resetting sync flags for database "
<<sinfo.dbinfo.name<<endl;
@@ -977,7 +977,7 @@ bool DOCConduit::postSyncAction(PilotDatabase * database,
DEBUGKPILOT<<"Installing file "<<localdb->dbPathName()<<" ("
<<sinfo.handheldDB<<") to the handheld"<<endl;
#endif
- QString dbpathname=localdb->dbPathName();
+ TQString dbpathname=localdb->dbPathName();
// This deletes localdb as well, which is just a cast from database
KPILOT_DELETE(database);
if (!fHandle->installFiles(dbpathname, false))
diff --git a/kpilot/conduits/docconduit/doc-conduit.h b/kpilot/conduits/docconduit/doc-conduit.h
index 834002bea..aefb4264f 100644
--- a/kpilot/conduits/docconduit/doc-conduit.h
+++ b/kpilot/conduits/docconduit/doc-conduit.h
@@ -31,7 +31,7 @@
#include <plugin.h>
class docSyncInfo;
-typedef QValueList<docSyncInfo> syncInfoList;
+typedef TQValueList<docSyncInfo> syncInfoList;
typedef enum eSyncDirectionEnum {
eSyncNone,
@@ -51,7 +51,7 @@ typedef enum eTextStatus {
};
-QString dirToString(eSyncDirectionEnum dir);
+TQString dirToString(eSyncDirectionEnum dir);
class DOCConduit:public ConduitAction {
Q_OBJECT
@@ -60,11 +60,11 @@ public:
public:
DOCConduit(KPilotLink * o,
- const char *n = 0L, const QStringList & a = QStringList());
+ const char *n = 0L, const TQStringList & a = TQStringList());
virtual ~ DOCConduit();
- bool encode(QStringList fileName, PilotDatabase * db);
- bool decode(PilotDatabase * db, QString fileName);
+ bool encode(TQStringList fileName, PilotDatabase * db);
+ bool decode(PilotDatabase * db, TQString fileName);
virtual bool exec();
protected:
virtual bool isCorrectDBTypeCreator(DBInfo dbinfo);
@@ -106,33 +106,33 @@ public slots:
*/
bool postSyncAction(PilotDatabase * dbinfo, docSyncInfo &sinfo, bool res = true);
- bool pcTextChanged(QString txtfn);
+ bool pcTextChanged(TQString txtfn);
bool hhTextChanged(PilotDatabase*docdb);
/** Opens the database with name dbname. For a local sync, this will be a
* PilotLocalDatabase, otherwise it will be a database on the serial device
* (i.e. an object of class PilotSerialDatabase) */
- PilotDatabase *openDOCDatabase(const QString &dbname);
+ PilotDatabase *openDOCDatabase(const TQString &dbname);
- QString constructPDBFileName(QString name);
- QString constructTXTFileName(QString name);
+ TQString constructPDBFileName(TQString name);
+ TQString constructTXTFileName(TQString name);
eSyncDirectionEnum eConflictResolution;
int fTXTBookmarks, fPDBBookmarks;
- QStringList fDBListSynced;
- QStringList fDBNames;
+ TQStringList fDBListSynced;
+ TQStringList fDBNames;
syncInfoList fSyncInfoList;
syncInfoList::Iterator fSyncInfoListIterator;
long int dbnr;
- QStringList docnames;
- QStringList::Iterator dociterator;
+ TQStringList docnames;
+ TQStringList::Iterator dociterator;
};
class docSyncInfo
{
public:
- docSyncInfo(QString hhDB=QString(), QString txtfn=QString(), QString pdbfn=QString(), eSyncDirectionEnum dir=eSyncNone)
+ docSyncInfo(TQString hhDB=TQString(), TQString txtfn=TQString(), TQString pdbfn=TQString(), eSyncDirectionEnum dir=eSyncNone)
{
handheldDB=hhDB;
txtfilename=txtfn;
@@ -142,7 +142,7 @@ public:
fPalmStatus=eStatNone;
};
~docSyncInfo(){};
- QString handheldDB, txtfilename, pdbfilename;
+ TQString handheldDB, txtfilename, pdbfilename;
DBInfo dbinfo;
eSyncDirectionEnum direction;
eTextStatus fPCStatus, fPalmStatus;
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.cc b/kpilot/conduits/docconduit/doc-conflictdialog.cc
index 7dafd9b66..50ecbbd1e 100644
--- a/kpilot/conduits/docconduit/doc-conflictdialog.cc
+++ b/kpilot/conduits/docconduit/doc-conflictdialog.cc
@@ -28,54 +28,54 @@
#include "options.h"
#include "doc-conflictdialog.moc"
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qbuttongroup.h>
+#include <tqlabel.h>
+#include <tqpushbutton.h>
+#include <tqlayout.h>
+#include <tqbuttongroup.h>
#include <kmessagebox.h>
-#include <qtimer.h>
-#include <qtable.h>
-#include <qcombobox.h>
-#include <qscrollview.h>
+#include <tqtimer.h>
+#include <tqtable.h>
+#include <tqcombobox.h>
+#include <tqscrollview.h>
-ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syncInfoList*sinfo, KPilotLink*lnk )
+ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk )
: KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) {
FUNCTIONSETUP;
syncInfo=sinfo;
hasConflicts=false;
- QWidget *page = new QWidget( this );
+ TQWidget *page = new TQWidget( this );
setMainWidget(page);
- QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
+ TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
// First, insert the texts on top:
- textLabel1 = new QLabel(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( QLabel::WordBreak | QLabel::AlignVCenter ) );
+ 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 ) );
topLayout->addWidget(textLabel1);
- textLabel2 = new QLabel(i18n("You can also change the sync direction for databases without a conflict." ), page );
- textLabel2->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter ) );
+ textLabel2 = new TQLabel(i18n("You can also change the sync direction for databases without a conflict." ), page );
+ textLabel2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
topLayout->addWidget(textLabel2);
- resolutionGroupBox = new QGroupBox(i18n("DOC Databases"), page );
- QVBoxLayout*playout = new QVBoxLayout(resolutionGroupBox);
- QScrollView* sv = new QScrollView(resolutionGroupBox);
+ resolutionGroupBox = new TQGroupBox(i18n("DOC Databases"), page );
+ TQVBoxLayout*playout = new TQVBoxLayout(resolutionGroupBox);
+ TQScrollView* sv = new TQScrollView(resolutionGroupBox);
playout->addWidget(sv);
- sv->setResizePolicy(QScrollView::AutoOneFit);
- sv->setHScrollBarMode(QScrollView::AlwaysOff);
+ sv->setResizePolicy(TQScrollView::AutoOneFit);
+ sv->setHScrollBarMode(TQScrollView::AlwaysOff);
sv->setMargin(5);
- QFrame* big_box = new QFrame(sv->viewport());
+ TQFrame* big_box = new TQFrame(sv->viewport());
sv->addChild(big_box);
- resolutionGroupBoxLayout = new QGridLayout( big_box, syncInfo->size(), 3 );
+ resolutionGroupBoxLayout = new TQGridLayout( big_box, syncInfo->size(), 3 );
resolutionGroupBoxLayout->setAlignment( Qt::AlignTop );
// Invisible button group for the information buttons to use the same slot for all of them (see Dallheimer's book, page 309f)
- QButtonGroup *bgroup = new QButtonGroup( this );
+ TQButtonGroup *bgroup = new TQButtonGroup( this );
bgroup->hide();
- QObject::connect(bgroup, SIGNAL(clicked(int)), this, SLOT(slotInfo(int)));
+ TQObject::connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotInfo(int)));
if (syncInfo) {
DEBUGKPILOT<<"Adding resolution options for the databases "<<endl;
@@ -89,18 +89,18 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn
cE.conflict=(si.direction==eSyncConflict);
DEBUGKPILOT<<"Adding "<<si.handheldDB<<" to the conflict resolution dialog"<<endl;
- QString text=si.handheldDB;
+ TQString text=si.handheldDB;
if (cE.conflict) {
text=CSL1("<qt><b><font color=red>")+text+CSL1("</font></b></qt>");
DEBUGKPILOT<<"We have a conflict for database "<<si.handheldDB<<endl;
hasConflicts=true;
}
- cE.dbname=new QLabel(text, big_box);
+ cE.dbname=new TQLabel(text, big_box);
resolutionGroupBoxLayout->addWidget( cE.dbname, cE.index, 0 );
- cE.resolution=new QComboBox( FALSE, big_box);
- cE.resolution->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7,
- (QSizePolicy::SizeType)0, 0, 0,
+ cE.resolution=new TQComboBox( FALSE, big_box);
+ cE.resolution->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7,
+ (TQSizePolicy::SizeType)0, 0, 0,
cE.resolution->sizePolicy().hasHeightForWidth() ) );
cE.resolution->clear();
cE.resolution->insertItem( i18n( "No Sync" ) );
@@ -110,7 +110,7 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn
cE.resolution->setCurrentItem((int)si.direction);
resolutionGroupBoxLayout->addWidget( cE.resolution, cE.index, 1);
- cE.info = new QPushButton( i18n("More Info..."), big_box );
+ cE.info = new TQPushButton( i18n("More Info..."), big_box );
resolutionGroupBoxLayout->addWidget(cE.info, cE.index, 2);
bgroup->insert(cE.info);
@@ -123,11 +123,11 @@ ResolutionDialog::ResolutionDialog( QWidget* parent, const QString& caption, syn
topLayout->addWidget( resolutionGroupBox );
- resize( QSize(600, 480).expandedTo(minimumSizeHint()) );
+ resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
- if (fHandle) tickleTimer=new QTimer(this, "TickleTimer");
+ if (fHandle) tickleTimer=new TQTimer(this, "TickleTimer");
if (tickleTimer) {
- connect( tickleTimer, SIGNAL(timeout()), this, SLOT(_tickle()) );
+ connect( tickleTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(_tickle()) );
tickleTimer->start( 10000 ); // tickle the palm every 10 seconds to prevent a timeout until the sync is really finished.
}
@@ -143,14 +143,14 @@ ResolutionDialog::~ResolutionDialog()
/* virtual slot */ void ResolutionDialog::slotOk() {
FUNCTIONSETUP;
- QValueList<conflictEntry>::Iterator ceIt;
+ TQValueList<conflictEntry>::Iterator ceIt;
for (ceIt=conflictEntries.begin(); ceIt!=conflictEntries.end(); ++ceIt) {
(*syncInfo)[(*ceIt).index].direction=(eSyncDirectionEnum)((*ceIt).resolution->currentItem());
}
KDialogBase::slotOk();
}
-QString eTextStatusToString(eTextStatus stat) {
+TQString eTextStatusToString(eTextStatus stat) {
switch(stat) {
case eStatNone: return i18n("unchanged");
case eStatNew: return i18n("new");
@@ -168,7 +168,7 @@ void ResolutionDialog::slotInfo(int index) {
int ix=cE.index;
if (!syncInfo) return;
docSyncInfo si=(*syncInfo)[ix];
- QString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
+ TQString text=i18n("Status of the database %1:\n\n").arg(si.handheldDB);
text+=i18n("Handheld: %1\n").arg(eTextStatusToString(si.fPalmStatus));
text+=i18n("Desktop: %1\n").arg(eTextStatusToString(si.fPCStatus));
diff --git a/kpilot/conduits/docconduit/doc-conflictdialog.h b/kpilot/conduits/docconduit/doc-conflictdialog.h
index f8ad8caf7..00a3ef1a5 100644
--- a/kpilot/conduits/docconduit/doc-conflictdialog.h
+++ b/kpilot/conduits/docconduit/doc-conflictdialog.h
@@ -43,9 +43,9 @@ class KPilotLink;
typedef struct conflictEntry {
- QLabel*dbname;
- QComboBox* resolution;
- QPushButton*info;
+ TQLabel*dbname;
+ TQComboBox* resolution;
+ TQPushButton*info;
int index;
bool conflict;
};
@@ -56,23 +56,23 @@ class ResolutionDialog : public KDialogBase
Q_OBJECT
public:
- ResolutionDialog( QWidget* parent=0, const QString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
+ ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
~ResolutionDialog();
bool hasConflicts;
public slots:
void _tickle();
protected:
- QTimer* tickleTimer;
+ TQTimer* tickleTimer;
KPilotLink* fHandle;
protected:
- QGroupBox* resolutionGroupBox;
- QGridLayout*resolutionGroupBoxLayout;
+ TQGroupBox* resolutionGroupBox;
+ TQGridLayout*resolutionGroupBoxLayout;
syncInfoList*syncInfo;
- QValueList<conflictEntry> conflictEntries;
- QLabel *textLabel1,*textLabel2;
+ TQValueList<conflictEntry> conflictEntries;
+ TQLabel *textLabel1,*textLabel2;
protected slots:
virtual void slotOk();
diff --git a/kpilot/conduits/docconduit/doc-factory.cc b/kpilot/conduits/docconduit/doc-factory.cc
index 3d2a16b11..cfab20f4d 100644
--- a/kpilot/conduits/docconduit/doc-factory.cc
+++ b/kpilot/conduits/docconduit/doc-factory.cc
@@ -54,7 +54,7 @@ const char *DOCConduitFactory::dbDOCcreator = "REAd";
-DOCConduitFactory::DOCConduitFactory(QObject * p, const char *n):
+DOCConduitFactory::DOCConduitFactory(TQObject * p, const char *n):
KLibFactory(p, n)
{
FUNCTIONSETUP;
@@ -77,8 +77,8 @@ DOCConduitFactory::~DOCConduitFactory()
}
-/* virtual */ QObject * DOCConduitFactory::createObject(QObject * p,
- const char *n, const char *c, const QStringList & a)
+/* virtual */ TQObject * DOCConduitFactory::createObject(TQObject * p,
+ const char *n, const char *c, const TQStringList & a)
{
FUNCTIONSETUP;
@@ -87,7 +87,7 @@ DOCConduitFactory::~DOCConduitFactory()
#endif
if (qstrcmp(c, "ConduitConfigBase") == 0)
{
- QWidget *w = dynamic_cast<QWidget *>(p);
+ TQWidget *w = dynamic_cast<TQWidget *>(p);
if (w)
{
return new DOCWidgetConfig(w,n);
diff --git a/kpilot/conduits/docconduit/doc-factory.h b/kpilot/conduits/docconduit/doc-factory.h
index c848777a0..312b9def9 100644
--- a/kpilot/conduits/docconduit/doc-factory.h
+++ b/kpilot/conduits/docconduit/doc-factory.h
@@ -41,7 +41,7 @@ class DOCConduitFactory:public KLibFactory
Q_OBJECT
public:
- DOCConduitFactory(QObject * = 0L, const char * = 0L);
+ DOCConduitFactory(TQObject * = 0L, const char * = 0L);
virtual ~ DOCConduitFactory();
static KAboutData *about() {
@@ -55,10 +55,10 @@ public:
protected:
- virtual QObject * createObject(QObject * parent = 0,
+ virtual TQObject * createObject(TQObject * parent = 0,
const char *name = 0,
- const char *classname = "QObject",
- const QStringList & args = QStringList());
+ const char *classname = "TQObject",
+ const TQStringList & args = TQStringList());
private:
KInstance * fInstance;
diff --git a/kpilot/conduits/docconduit/doc-setup.cc b/kpilot/conduits/docconduit/doc-setup.cc
index a6de2d2ad..6e6858a5c 100644
--- a/kpilot/conduits/docconduit/doc-setup.cc
+++ b/kpilot/conduits/docconduit/doc-setup.cc
@@ -28,10 +28,10 @@
#include "options.h"
-#include <qtabwidget.h>
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qcombobox.h>
+#include <tqtabwidget.h>
+#include <tqcheckbox.h>
+#include <tqbuttongroup.h>
+#include <tqcombobox.h>
#include <kconfig.h>
#include <kurlrequester.h>
@@ -43,7 +43,7 @@
#include "docconduitSettings.h"
-DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n):
+DOCWidgetConfig::DOCWidgetConfig(TQWidget * w, const char *n):
ConduitConfigBase(w, n),
fConfigWidget(new DOCWidget(w))
{
@@ -51,8 +51,8 @@ DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n):
fWidget=fConfigWidget;
- QStringList l = KGlobal::charsets()->descriptiveEncodingNames();
- for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it)
+ TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
+ for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it)
{
fConfigWidget->fEncoding->insertItem(*it);
}
@@ -63,9 +63,9 @@ DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n):
fConduitName=i18n("Palm DOC");
-#define CMOD(a,b) connect(fConfigWidget->a,SIGNAL(b),this,SLOT(modified()))
- CMOD(fTXTDir,textChanged(const QString &));
- CMOD(fPDBDir,textChanged(const QString &));
+#define CMOD(a,b) connect(fConfigWidget->a,TQT_SIGNAL(b),this,TQT_SLOT(modified()))
+ CMOD(fTXTDir,textChanged(const TQString &));
+ CMOD(fPDBDir,textChanged(const TQString &));
CMOD(fkeepPDBLocally,clicked());
CMOD(fConflictResolution,clicked(int));
CMOD(fConvertBookmarks,stateChanged(int));
@@ -77,7 +77,7 @@ DOCWidgetConfig::DOCWidgetConfig(QWidget * w, const char *n):
CMOD(fNoConversionOfBmksOnly,stateChanged(int));
CMOD(fAlwaysUseResolution,stateChanged(int));
CMOD(fPCBookmarks,clicked(int));
- CMOD(fEncoding,textChanged(const QString &));
+ CMOD(fEncoding,textChanged(const TQString &));
#undef CMOD
fConfigWidget->adjustSize();
diff --git a/kpilot/conduits/docconduit/doc-setup.h b/kpilot/conduits/docconduit/doc-setup.h
index 470585e01..32d1b54bc 100644
--- a/kpilot/conduits/docconduit/doc-setup.h
+++ b/kpilot/conduits/docconduit/doc-setup.h
@@ -36,7 +36,7 @@ class DOCWidget;
class DOCWidgetConfig : public ConduitConfigBase
{
public:
- DOCWidgetConfig(QWidget *, const char *);
+ DOCWidgetConfig(TQWidget *, const char *);
virtual void commit();
virtual void load();
protected:
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc b/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
index 5bdacba8c..29713ffae 100644
--- a/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/kpilot/conduits/docconduit/kpalmdoc_dlg.cc
@@ -31,12 +31,12 @@
#include <stdio.h>
#include <iostream>
-#include <qtabwidget.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qcombobox.h>
+#include <tqtabwidget.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqbuttongroup.h>
+#include <tqlabel.h>
+#include <tqcombobox.h>
#include <klocale.h>
#include <kconfig.h>
@@ -54,24 +54,24 @@
#include "kpalmdocSettings.h"
-ConverterDlg::ConverterDlg( QWidget *parent, const QString& caption)
+ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
: KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1,
KDialogBase::Close, true, i18n("&About"))
{
- QWidget *page = makeHBoxMainWidget();
+ TQWidget *page = makeHBoxMainWidget();
dlg=new ConverterDlgBase(page);
- QStringList l = KGlobal::charsets()->descriptiveEncodingNames();
- for ( QStringList::Iterator it = l.begin(); it != l.end(); ++it)
+ TQStringList l = KGlobal::charsets()->descriptiveEncodingNames();
+ for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it)
{
dlg->fEncoding->insertItem(*it);
}
readSettings();
- connect(dlg->fDirectories, SIGNAL(toggled(bool)),
- this, SLOT(slotDirectories(bool)));
- connect(dlg->fTextToPDB, SIGNAL(clicked()), this, SLOT(slotToPDB()));
- connect(dlg->fPDBToText, SIGNAL(clicked()), this, SLOT(slotToText()));
+ connect(dlg->fDirectories, TQT_SIGNAL(toggled(bool)),
+ this, TQT_SLOT(slotDirectories(bool)));
+ connect(dlg->fTextToPDB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToPDB()));
+ connect(dlg->fPDBToText, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotToText()));
resize(minimumSize());
}
@@ -117,7 +117,7 @@ void ConverterDlg::readSettings()
slotDirectories(dir);
dlg->fAskOverwrite->setChecked( KPalmDocSettings::askOverwrite() );
dlg->fVerbose->setChecked( KPalmDocSettings::verboseMessages() );
- QString encoding = KPalmDocSettings::encoding();
+ TQString encoding = KPalmDocSettings::encoding();
#ifdef DEBUG
DEBUGKPILOT << fname << ": Encoding=" << encoding << endl;
#endif
@@ -162,11 +162,11 @@ void ConverterDlg::slotToText()
bool dir=dlg->fDirectories->isChecked();
- QString txturl=dlg->fTXTDir->url();
- QString pdburl=dlg->fPDBDir->url();
+ TQString txturl=dlg->fTXTDir->url();
+ TQString pdburl=dlg->fPDBDir->url();
- QFileInfo txtinfo(txturl);
- QFileInfo pdbinfo(pdburl);
+ TQFileInfo txtinfo(txturl);
+ TQFileInfo pdbinfo(pdburl);
if (dir)
{
@@ -176,7 +176,7 @@ void ConverterDlg::slotToText()
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").arg(pdburl)
- .arg(pdbinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel());
+ .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes)
{
pdburl=pdbinfo.dirPath(true);
@@ -212,7 +212,7 @@ void ConverterDlg::slotToText()
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
- .arg(txtinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel());
+ .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) {
txturl=txtinfo.dirPath(true);
txtinfo.setFile(txturl);
@@ -235,13 +235,13 @@ void ConverterDlg::slotToText()
// Now that we have both directories, create the converter object
DEBUGKPILOT<<"Pdbinfo.dir="<<pdbinfo.dir().absPath()<<endl;
DEBUGKPILOT<<"txtinfo.dir="<<txtinfo.dir().absPath()<<endl;
- QStringList pdbfiles(pdbinfo.dir().entryList(CSL1("*.pdb")));
- QStringList converted_Files;
+ TQStringList pdbfiles(pdbinfo.dir().entryList(CSL1("*.pdb")));
+ TQStringList converted_Files;
DEBUGKPILOT<<"Length of filename list: "<<pdbfiles.size()<<endl;
- for ( QStringList::Iterator it = pdbfiles.begin(); it != pdbfiles.end(); ++it )
+ for ( TQStringList::Iterator it = pdbfiles.begin(); it != pdbfiles.end(); ++it )
{
- QString txtfile=QFileInfo(*it).baseName(true)+CSL1(".txt");
+ TQString txtfile=TQFileInfo(*it).baseName(true)+CSL1(".txt");
DEBUGKPILOT<<"pdbfile="<<*it<<", pdbdir="<<pdburl<<", txtfile="<<txtfile<<", txtdir="<<txturl<<endl;
if (convertPDBtoTXT(pdburl, *it, txturl, txtfile, &conv))
{
@@ -311,11 +311,11 @@ void ConverterDlg::slotToPDB()
bool dir=dlg->fDirectories->isChecked();
- QString txturl=dlg->fTXTDir->url();
- QString pdburl=dlg->fPDBDir->url();
+ TQString txturl=dlg->fTXTDir->url();
+ TQString pdburl=dlg->fPDBDir->url();
- QFileInfo txtinfo(txturl);
- QFileInfo pdbinfo(pdburl);
+ TQFileInfo txtinfo(txturl);
+ TQFileInfo pdbinfo(pdburl);
if (dir)
{
@@ -325,7 +325,7 @@ void ConverterDlg::slotToPDB()
i18n("<qt>You selected to sync folders, "
"but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>").arg(txturl)
- .arg(txtinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel());
+ .arg(txtinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes)
{
txturl=txtinfo.dirPath(true);
@@ -351,7 +351,7 @@ void ConverterDlg::slotToPDB()
"but gave a filename instead (<em>%1</em>)."
"<br>Use folder <em>%2</em> instead?</qt>")
.arg(pdburl)
- .arg(pdbinfo.dirPath(true)), QString::null, i18n("Use Folder"), KStdGuiItem::cancel());
+ .arg(pdbinfo.dirPath(true)), TQString::null, i18n("Use Folder"), KStdGuiItem::cancel());
if (res==KMessageBox::Yes) {
pdburl=pdbinfo.dirPath(true);
pdbinfo.setFile(pdburl);
@@ -373,13 +373,13 @@ void ConverterDlg::slotToPDB()
// Now that we have both directories, create the converter object
DEBUGKPILOT<<"Pdbinfo.dir="<<pdbinfo.dir().absPath()<<endl;
DEBUGKPILOT<<"txtinfo.dir="<<txtinfo.dir().absPath()<<endl;
- QStringList txtfiles(txtinfo.dir().entryList(CSL1("*.txt")));
- QStringList converted_Files;
+ TQStringList txtfiles(txtinfo.dir().entryList(CSL1("*.txt")));
+ TQStringList converted_Files;
DEBUGKPILOT<<"Length of filename list: "<<txtfiles.size()<<endl;
- for ( QStringList::Iterator it = txtfiles.begin(); it != txtfiles.end(); ++it )
+ for ( TQStringList::Iterator it = txtfiles.begin(); it != txtfiles.end(); ++it )
{
- QString pdbfile=QFileInfo(*it).baseName(true)+CSL1(".pdb");
+ TQString pdbfile=TQFileInfo(*it).baseName(true)+CSL1(".pdb");
DEBUGKPILOT<<"pdbfile="<<pdbfile<<", pdbdir="<<pdburl<<", txtfile="<<*it<<", txtdir="<<txturl<<endl;
if (convertTXTtoPDB(txturl, *it, pdburl, pdbfile, &conv))
{
@@ -444,19 +444,19 @@ void ConverterDlg::slotDirectories(bool dir)
}
}
-bool ConverterDlg::convertTXTtoPDB(QString txtdir, QString txtfile,
- QString pdbdir, QString pdbfile, DOCConverter*conv)
+bool ConverterDlg::convertTXTtoPDB(TQString txtdir, TQString txtfile,
+ TQString pdbdir, TQString pdbfile, DOCConverter*conv)
{
FUNCTIONSETUP;
bool res=false;
- QFileInfo dbfileinfo(pdbdir, pdbfile);
+ TQFileInfo dbfileinfo(pdbdir, pdbfile);
DEBUGKPILOT<<"Working on file "<<pdbfile<<endl;
if (!dbfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The database file <em>%1</em> already exists. Overwrite it?</qt>")
- .arg(dbfileinfo.filePath()), QString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
+ .arg(dbfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
{
- PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, QFileInfo(pdbfile).baseName(), false);
+ PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb)
{
if (!pdbdb->isOpen())
@@ -489,19 +489,19 @@ bool ConverterDlg::convertTXTtoPDB(QString txtdir, QString txtfile,
return res;
}
-bool ConverterDlg::convertPDBtoTXT(QString pdbdir, QString pdbfile,
- QString txtdir, QString txtfile, DOCConverter*conv)
+bool ConverterDlg::convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
+ TQString txtdir, TQString txtfile, DOCConverter*conv)
{
FUNCTIONSETUP;
bool res=false;
- QFileInfo txtfileinfo(txtdir, txtfile);
+ TQFileInfo txtfileinfo(txtdir, txtfile);
DEBUGKPILOT<<"Working on file "<<txtfile<<endl;
if (!txtfileinfo.exists() || !askOverwrite ||
(KMessageBox::Yes==KMessageBox::questionYesNo(this,
i18n("<qt>The text file <em>%1</em> already exists. Overwrite it?</qt>")
- .arg(txtfileinfo.filePath()), QString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
+ .arg(txtfileinfo.filePath()), TQString::null, i18n("Overwrite"), KStdGuiItem::cancel() ) ))
{
- PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, QFileInfo(pdbfile).baseName(), false);
+ PilotLocalDatabase*pdbdb=new PilotLocalDatabase(pdbdir, TQFileInfo(pdbfile).baseName(), false);
if (pdbdb)
{
if (pdbdb->isOpen())
diff --git a/kpilot/conduits/docconduit/kpalmdoc_dlg.h b/kpilot/conduits/docconduit/kpalmdoc_dlg.h
index 410b24568..5e9202b00 100644
--- a/kpilot/conduits/docconduit/kpalmdoc_dlg.h
+++ b/kpilot/conduits/docconduit/kpalmdoc_dlg.h
@@ -37,7 +37,7 @@ class ConverterDlg : public KDialogBase
Q_OBJECT
public:
- ConverterDlg( QWidget *parent=0, const QString& caption=0);
+ ConverterDlg( TQWidget *parent=0, const TQString& caption=0);
~ConverterDlg();
protected slots:
@@ -51,10 +51,10 @@ protected:
void readSettings();
// These two functions convert one single file to or from a pdb database
- bool convertTXTtoPDB(QString txtdir, QString txtfile,
- QString pdbdir, QString pdbfile, DOCConverter*conv);
- bool convertPDBtoTXT(QString pdbdir, QString pdbfile,
- QString txtdir, QString txtfile, DOCConverter*conv);
+ bool convertTXTtoPDB(TQString txtdir, TQString txtfile,
+ TQString pdbdir, TQString pdbfile, DOCConverter*conv);
+ bool convertPDBtoTXT(TQString pdbdir, TQString pdbfile,
+ TQString txtdir, TQString txtfile, DOCConverter*conv);
// The actual dialog widget (designer created) holding all controls
diff --git a/kpilot/conduits/docconduit/pilotDOCEntry.h b/kpilot/conduits/docconduit/pilotDOCEntry.h
index b1b9ba45b..4ecaf19a9 100644
--- a/kpilot/conduits/docconduit/pilotDOCEntry.h
+++ b/kpilot/conduits/docconduit/pilotDOCEntry.h
@@ -48,11 +48,11 @@ public:
PilotDOCEntry & operator=(const PilotDOCEntry & e);
- QString getText() {
+ TQString getText() {
fText.Decompress();
- return QString::fromLatin1((const char *) fText.text());
+ return TQString::fromLatin1((const char *) fText.text());
};
- void setText(QString newtext, bool compressed = false) {
+ void setText(TQString newtext, bool compressed = false) {
fText.setText((const unsigned char *) newtext.latin1(),
newtext.length(), compressed);
};