diff options
Diffstat (limited to 'src')
114 files changed, 3885 insertions, 3885 deletions
diff --git a/src/arkollon/data.cpp b/src/arkollon/data.cpp index 89b57d6..d99c295 100644 --- a/src/arkollon/data.cpp +++ b/src/arkollon/data.cpp @@ -4,7 +4,7 @@ static struct EmbedImage { int width, height, depth; const unsigned char *data; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -14,20 +14,20 @@ static struct EmbedImage { { 0, 0, 0, 0, 0, 0, 0, 0 } }; -const QImage& qembed_findImage( const QString& name ) +const TQImage& qembed_findImage( const TQString& name ) { - static QDict<QImage> dict; - QImage* img = dict.find( name ); + static TQDict<TQImage> dict; + TQImage* img = dict.find( name ); if ( !img ) { for ( int i = 0; embed_image_vec[i].data; i++ ) { if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) { - img = new QImage((uchar*)embed_image_vec[i].data, + img = new TQImage((uchar*)embed_image_vec[i].data, embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, - QImage::BigEndian ); + TQImage::BigEndian ); if ( embed_image_vec[i].alpha ) img->setAlphaBuffer( TRUE ); dict.insert( name, img ); @@ -35,7 +35,7 @@ const QImage& qembed_findImage( const QString& name ) } } if ( !img ) { - static QImage dummy; + static TQImage dummy; return dummy; } } diff --git a/src/arkollon/data.h b/src/arkollon/data.h index df9aa43..1526c1b 100644 --- a/src/arkollon/data.h +++ b/src/arkollon/data.h @@ -169,9 +169,9 @@ static const unsigned char uninstaller_sh_data[] = { 0x74,0x0a,0x64,0x6f,0x6e,0x65,0x0a,0x09,0x09,0x0a }; -#include <qimage.h> -#include <qdict.h> -static const QRgb misc_data[] = { +#include <ntqimage.h> +#include <ntqdict.h> +static const TQRgb misc_data[] = { 0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xff8f8f8f, 0xff8f8f8f,0xff8f8f8f,0xff8f8f8f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffcfcfc,0xfffbfbfb,0xfff9f9f9, 0xfff7f7f7,0xfff6f6f6,0xffffffff,0xff8f8f8f,0xff8f8f8f,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xffffffff,0xfffefefe,0xfffbfbfb,0xfffafafa,0xfff8f8f8, @@ -193,7 +193,7 @@ static const QRgb misc_data[] = { 0x0,0x0,0x0,0x0 }; -static const QRgb splash_data[] = { +static const TQRgb splash_data[] = { 0xff40bdff,0xff60cbff,0xff50c5ff,0xff61ccff,0xff51c5ff,0xff62ccff,0xff62ccff,0xff63ccff,0xff63ccff,0xff43c1ff,0xff64cdff,0xff54c8ff,0xff65ceff,0xff65ceff, 0xff55c8ff,0xff46c3ff,0xff67cfff,0xff47c3ff,0xff57cbff,0xff78d5ff,0xff68cfff,0xff57cbff,0xff46c3ff,0xff46c3ff,0xff66cfff,0xff45c2ff,0xff54c8ff,0xff75d3ff, 0xff43c1ff,0xff44c0ff,0xff43c1ff,0xff42c0ff,0xff63ccff,0xff41c0ff,0xff41bfff,0xff61ccff,0xff60ccff,0xff60ccff,0xff5fcbff,0xff3fbcff,0xff4fc2ff,0xff5fc9ff, @@ -2982,7 +2982,7 @@ static const QRgb splash_data[] = { 0xff26b0ff,0xff51bfff,0xff26afff,0xff26b0ff,0xff26b0ff,0xff52c1ff,0xff27b1ff,0xff28b2ff,0xff54c1ff,0xff29b2ff }; -static const QRgb packageIcon_data[] = { +static const TQRgb packageIcon_data[] = { 0xffffff,0xd06e6e6e,0xf68e8f8f,0xf2898a8b,0xf288898b,0xf288898b,0xf288898a,0xf288888a,0xf287888a,0xf288898a,0xf288898a,0xf288888a,0xf288888a,0xf287888a, 0xf2878889,0xf2878889,0xf2878889,0xf2868789,0xf2868789,0xf2868788,0xf2868788,0xf2868688,0xf2858688,0xf2858688,0xf2858687,0xf2858687,0xf2848687,0xf2848587, 0xf3858688,0xf2838384,0xc56b6b6b,0xffffff,0xffffff,0xd76f6f6f,0xfff7faff,0xfff0f5ff,0xffedf3ff,0xffeef4ff,0xffebf2fe,0xffeaf1fe,0xffebf2fe,0xffdce8fb, @@ -3058,8 +3058,8 @@ static const QRgb packageIcon_data[] = { 0x44000000,0x44000000,0x44000000,0x44000000,0x44000000,0x44030303,0x1d000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0, 0x0,0xffffff }; -#include <qcstring.h> +#include <ntqcstring.h> -const QImage& qembed_findImage( const QString& name ); +const TQImage& qembed_findImage( const TQString& name ); #endif diff --git a/src/arkollon/headerlistitem.cpp b/src/arkollon/headerlistitem.cpp index 2d850ac..731435c 100644 --- a/src/arkollon/headerlistitem.cpp +++ b/src/arkollon/headerlistitem.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "headerlistitem.h" -#include <qfontmetrics.h> -#include <qpainter.h> -#include <qapplication.h> +#include <ntqfontmetrics.h> +#include <ntqpainter.h> +#include <ntqapplication.h> #include "uninstallwizard.h" #include "wizard.h" -HeaderListItem::HeaderListItem(QListView* parent) - : QListViewItem(parent) +HeaderListItem::HeaderListItem(TQListView* parent) + : TQListViewItem(parent) { } -int HeaderListItem::compare(QListViewItem* i, int , bool ) const +int HeaderListItem::compare(TQListViewItem* i, int , bool ) const { switch (i->rtti()) { @@ -64,20 +64,20 @@ int HeaderListItem::compare(QListViewItem* i, int , bool ) const return 0; } -void HeaderListItem::paintCell(QPainter* p, const QColorGroup& cg, int , int width, int ) +void HeaderListItem::paintCell(TQPainter* p, const TQColorGroup& cg, int , int width, int ) { p->fillRect(0, 0, width, height(), cg.base()); - QFont boldFont = p->font(); + TQFont boldFont = p->font(); boldFont.setBold(true); p->setFont(boldFont); - p->drawText(listView()->itemMargin(), listView()->itemMargin(), width, QFontMetrics(boldFont).height(), Qt::AlignLeft, text(0)); + p->drawText(listView()->itemMargin(), listView()->itemMargin(), width, TQFontMetrics(boldFont).height(), TQt::AlignLeft, text(0)); - int textWidth = QFontMetrics(boldFont).width(text(0)); + int textWidth = TQFontMetrics(boldFont).width(text(0)); p->fillRect(0, height() - 4 - listView()->itemMargin(), textWidth-10, 4, cg.highlight()); - QColor ca = cg.highlight(); - QColor cb = cg.base(); + TQColor ca = cg.highlight(); + TQColor cb = cg.base(); // Taken from KPixmapEffect::gradient int rDiff, gDiff, bDiff; int rca, gca, bca /*, rcb, gcb, bcb*/; @@ -101,26 +101,26 @@ void HeaderListItem::paintCell(QPainter* p, const QColorGroup& cg, int , int wid gl += gcdelta; bl += bcdelta; - p->setPen(QColor(rl>>16, gl>>16, bl>>16)); + p->setPen(TQColor(rl>>16, gl>>16, bl>>16)); p->drawLine(x, height() - 4 - listView()->itemMargin(), x, height() - listView()->itemMargin() - 1); } } -void HeaderListItem::paintFocus(QPainter* , const QColorGroup& , const QRect& ) +void HeaderListItem::paintFocus(TQPainter* , const TQColorGroup& , const TQRect& ) { } -int HeaderListItem::width(const QFontMetrics& , const QListView* lv, int ) const +int HeaderListItem::width(const TQFontMetrics& , const TQListView* lv, int ) const { - QFont boldFont = qApp->font(); + TQFont boldFont = tqApp->font(); boldFont.setBold(true); - QFontMetrics metrics(boldFont); + TQFontMetrics metrics(boldFont); return metrics.width(text(0)) + lv->itemMargin() + 10; } void HeaderListItem::setup() { - setHeight(qApp->fontMetrics().height() + listView()->itemMargin()*3 + 4); + setHeight(tqApp->fontMetrics().height() + listView()->itemMargin()*3 + 4); } diff --git a/src/arkollon/headerlistitem.h b/src/arkollon/headerlistitem.h index 5872220..3be07e5 100644 --- a/src/arkollon/headerlistitem.h +++ b/src/arkollon/headerlistitem.h @@ -20,17 +20,17 @@ #ifndef HEADERLISTITEM_H #define HEADERLISTITEM_H -#include <qlistview.h> +#include <ntqlistview.h> -class HeaderListItem : public QListViewItem +class HeaderListItem : public TQListViewItem { public: - HeaderListItem(QListView* parent); - int compare(QListViewItem* i, int col, bool ascending) const; - void paintCell(QPainter* p, const QColorGroup& cg, int column, int width, int align); - void paintFocus(QPainter* p, const QColorGroup& cg, const QRect& r); + HeaderListItem(TQListView* parent); + int compare(TQListViewItem* i, int col, bool ascending) const; + void paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align); + void paintFocus(TQPainter* p, const TQColorGroup& cg, const TQRect& r); void setup(); - int width(const QFontMetrics& fm, const QListView* lv, int c) const; + int width(const TQFontMetrics& fm, const TQListView* lv, int c) const; int rtti() const { return 1002; } int section; diff --git a/src/arkollon/logdialog.ui b/src/arkollon/logdialog.ui index 9e2b24e..5b3bfc9 100644 --- a/src/arkollon/logdialog.ui +++ b/src/arkollon/logdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>LogDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>LogDialog</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>logBox</cstring> </property> @@ -33,7 +33,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -58,7 +58,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> diff --git a/src/arkollon/rcparser.cpp b/src/arkollon/rcparser.cpp index dc9442f..82123dc 100644 --- a/src/arkollon/rcparser.cpp +++ b/src/arkollon/rcparser.cpp @@ -19,9 +19,9 @@ ***************************************************************************/ #include "rcparser.h" -#include <qregexp.h> -#include <qfile.h> -#include <qtextstream.h> +#include <ntqregexp.h> +#include <ntqfile.h> +#include <ntqtextstream.h> RcParser::RcParser() { @@ -32,18 +32,18 @@ RcParser::~RcParser() { } -void RcParser::addSearchDir(QString dir) +void RcParser::addSearchDir(TQString dir) { dirs.append(dir); } -bool RcParser::openFile(QString name) +bool RcParser::openFile(TQString name) { // Check if it exists fileName = ""; - for ( QStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) + for ( TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) { - if (QFile::exists((*it) + "/" + name)) + if (TQFile::exists((*it) + "/" + name)) { fileName = (*it) + "/" + name; break; @@ -57,17 +57,17 @@ bool RcParser::openFile(QString name) sections.clear(); // Read the file's contents - QFile file(fileName); + TQFile file(fileName); file.open(IO_ReadOnly); - QTextStream stream(&file); + TQTextStream stream(&file); - QRegExp sectionRegExp("^\\[([^\\]]*)\\]$"); - QRegExp pairRegExp("^([^=\\s]*)([=\\s]*)(.*)$"); + TQRegExp sectionRegExp("^\\[([^\\]]*)\\]$"); + TQRegExp pairRegExp("^([^=\\s]*)([=\\s]*)(.*)$"); currentSection = "RcParserDefaultSection"; while (!stream.atEnd()) { - QString line = stream.readLine(); + TQString line = stream.readLine(); if (line.left(1) == "#") // Comment continue; @@ -81,8 +81,8 @@ bool RcParser::openFile(QString name) } if (pairRegExp.search(line) != -1) { - QString key = pairRegExp.cap(1); - QString value = pairRegExp.cap(3); + TQString key = pairRegExp.cap(1); + TQString value = pairRegExp.cap(3); sections[currentSection][key] = value; //printf("Found pair \"%s\" = \"%s\"\n", key.latin1(), value.latin1()); continue; @@ -95,25 +95,25 @@ bool RcParser::openFile(QString name) return true; } -void RcParser::setSection(QString section) +void RcParser::setSection(TQString section) { currentSection = section; } -QStringList RcParser::sectionList() +TQStringList RcParser::sectionList() { return sections.keys(); } -QString RcParser::readString(QString key, QString def) +TQString RcParser::readString(TQString key, TQString def) { - QString ret = sections[currentSection][key]; + TQString ret = sections[currentSection][key]; if (ret.isEmpty()) return def; return ret; } -int RcParser::readInt(QString key, int def) +int RcParser::readInt(TQString key, int def) { bool ok; int ret = sections[currentSection][key].toInt(&ok); @@ -122,7 +122,7 @@ int RcParser::readInt(QString key, int def) return ret; } -bool RcParser::readBool(QString key, bool def) +bool RcParser::readBool(TQString key, bool def) { bool ret = def; if (sections[currentSection][key].lower() == "true") @@ -136,9 +136,9 @@ bool RcParser::readBool(QString key, bool def) return ret; } -QStringList RcParser::readList(QString key) +TQStringList RcParser::readList(TQString key) { - return QStringList::split(",", sections[currentSection][key]); + return TQStringList::split(",", sections[currentSection][key]); } diff --git a/src/arkollon/rcparser.h b/src/arkollon/rcparser.h index 8739b0e..71842fa 100644 --- a/src/arkollon/rcparser.h +++ b/src/arkollon/rcparser.h @@ -20,8 +20,8 @@ #ifndef RCPARSER_H #define RCPARSER_H -#include <qstringlist.h> -#include <qmap.h> +#include <ntqstringlist.h> +#include <ntqmap.h> class RcParser { @@ -29,22 +29,22 @@ public: RcParser(); ~RcParser(); - void addSearchDir(QString dir); - bool openFile(QString name); + void addSearchDir(TQString dir); + bool openFile(TQString name); - QStringList sectionList(); - void setSection(QString section); + TQStringList sectionList(); + void setSection(TQString section); - QString readString(QString key, QString def=QString::null); - int readInt(QString key, int def=0); - bool readBool(QString key, bool def=false); - QStringList readList(QString key); + TQString readString(TQString key, TQString def=TQString::null); + int readInt(TQString key, int def=0); + bool readBool(TQString key, bool def=false); + TQStringList readList(TQString key); private: - QStringList dirs; - QString fileName; - QString currentSection; - QMap< QString, QMap< QString, QString> > sections; + TQStringList dirs; + TQString fileName; + TQString currentSection; + TQMap< TQString, TQMap< TQString, TQString> > sections; }; #endif diff --git a/src/arkollon/torkarkollon.cpp b/src/arkollon/torkarkollon.cpp index 8d24bd5..fa4a3d4 100644 --- a/src/arkollon/torkarkollon.cpp +++ b/src/arkollon/torkarkollon.cpp @@ -27,25 +27,25 @@ #include <unistd.h> #include <sys/types.h> -#include <qapplication.h> +#include <ntqapplication.h> #include "wizard.h" #include "uninstallwizard.h" int main(int argc, char *argv[]) { - QApplication app(argc, argv); + TQApplication app(argc, argv); // Check if we're root if (getuid() != 0) { - QString command = "kdesu -t -i tork -n -c \""; + TQString command = "kdesu -t -i tork -n -c \""; for (int i=0 ; i<app.argc() ; i++) { - if (QString(app.argv()[i]).contains(" ")) - command += "\\\"" + QString(app.argv()[i]) + "\\\" "; + if (TQString(app.argv()[i]).contains(" ")) + command += "\\\"" + TQString(app.argv()[i]) + "\\\" "; else - command += QString(app.argv()[i]) + " "; + command += TQString(app.argv()[i]) + " "; } command += "\""; return system(command.latin1()); @@ -55,14 +55,14 @@ int main(int argc, char *argv[]) for ( int i = 1; i < app.argc(); i++ ) { - if (QString(app.argv()[i]) == "--help") + if (TQString(app.argv()[i]) == "--help") { printf("Arkollon is a utility to aid installation and removal of packages from source.\n"); printf("Usage: arkollon DIRECTORY Installs a source package from DIRECTORY\n"); printf(" arkollon --uninstall Starts the uninstaller\n"); return 0; } - if (QString(app.argv()[i]) == "--uninstall") + if (TQString(app.argv()[i]) == "--uninstall") wizard = new UninstallWizard(NULL); } diff --git a/src/arkollon/uninstallwizard.cpp b/src/arkollon/uninstallwizard.cpp index ac8f2f8..58bd6b4 100644 --- a/src/arkollon/uninstallwizard.cpp +++ b/src/arkollon/uninstallwizard.cpp @@ -23,20 +23,20 @@ #include "headerlistitem.h" #include "data.h" -#include <qregexp.h> -#include <qwidgetstack.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qheader.h> -#include <qlistbox.h> -#include <qmessagebox.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> +#include <ntqregexp.h> +#include <ntqwidgetstack.h> +#include <ntqfile.h> +#include <ntqtextstream.h> +#include <ntqheader.h> +#include <ntqlistbox.h> +#include <ntqmessagebox.h> +#include <ntqpushbutton.h> +#include <ntqlineedit.h> +#include <ntqtextedit.h> +#include <ntqlabel.h> -AppListItem::AppListItem(QString nN, QString n, QListView* parent) - : QCheckListItem(parent, "", QCheckListItem::CheckBox) +AppListItem::AppListItem(TQString nN, TQString n, TQListView* parent) + : TQCheckListItem(parent, "", TQCheckListItem::CheckBox) { niceName = nN; name = n; @@ -45,7 +45,7 @@ AppListItem::AppListItem(QString nN, QString n, QListView* parent) setText(0, niceName); } -int AppListItem::compare(QListViewItem* i, int col, bool ascending) const +int AppListItem::compare(TQListViewItem* i, int col, bool ascending) const { switch (i->rtti()) { @@ -56,7 +56,7 @@ int AppListItem::compare(QListViewItem* i, int col, bool ascending) const return -1; if (section > item->section) return 1; - return QListViewItem::compare(i, col, ascending); + return TQListViewItem::compare(i, col, ascending); } break; @@ -73,7 +73,7 @@ int AppListItem::compare(QListViewItem* i, int col, bool ascending) const } -UninstallWizard::UninstallWizard(QWidget* parent, const char* name, bool modal, WFlags fl) +UninstallWizard::UninstallWizard(TQWidget* parent, const char* name, bool modal, WFlags fl) : WizardBase(parent,name, modal,fl) { mainStack->raiseWidget(1); @@ -89,16 +89,16 @@ UninstallWizard::UninstallWizard(QWidget* parent, const char* name, bool modal, icon.convertFromImage(qembed_findImage("misc")); - externalProcess = new QProcess(this); + externalProcess = new TQProcess(this); connect(externalProcess, SIGNAL(processExited()), SLOT(processExited())); connect(externalProcess, SIGNAL(readyReadStdout()), SLOT(readyReadStdout())); connect(externalProcess, SIGNAL(readyReadStderr()), SLOT(readyReadStderr())); - QFile uninstallScript("/tmp/arkollon-uninstall.sh"); + TQFile uninstallScript("/tmp/arkollon-uninstall.sh"); if (uninstallScript.exists()) uninstallScript.remove(); uninstallScript.open(IO_WriteOnly); - QDataStream stream(&uninstallScript); + TQDataStream stream(&uninstallScript); stream.writeRawBytes((const char*)uninstaller_sh_data, uninstaller_sh_len); uninstallScript.close(); @@ -111,7 +111,7 @@ UninstallWizard::UninstallWizard(QWidget* parent, const char* name, bool modal, UninstallWizard::~UninstallWizard() { - QFile uninstallScript("/tmp/arkollon-uninstall.sh"); + TQFile uninstallScript("/tmp/arkollon-uninstall.sh"); if (uninstallScript.exists()) uninstallScript.remove(); } @@ -151,10 +151,10 @@ void UninstallWizard::nextPressed() if (currentId == 0) { bool checked = false; - QStringList argList; + TQStringList argList; argList.append("/bin/sh"); argList.append("/tmp/arkollon-uninstall.sh"); - for ( QListViewItem * myChild = appList->firstChild() ; myChild != NULL ; myChild = myChild->nextSibling()) + for ( TQListViewItem * myChild = appList->firstChild() ; myChild != NULL ; myChild = myChild->nextSibling()) { if (myChild->rtti() != 1003) continue; @@ -167,7 +167,7 @@ void UninstallWizard::nextPressed() } if (!checked) { - QMessageBox::warning(this, "Error", "You need to select at least one package to remove", QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::warning(this, "Error", "You need to select at least one package to remove", TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); return; } fileList->clear(); @@ -192,7 +192,7 @@ void UninstallWizard::processExited() case ListingPackages: if (appList->childCount() <= 0) { - QMessageBox::warning(NULL, "Warning", "There are no packages installed", QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::warning(NULL, "Warning", "There are no packages installed", TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); reject(); return; } @@ -216,14 +216,14 @@ void UninstallWizard::readyReadStdout() { while (externalProcess->canReadLineStdout()) { - QString line = externalProcess->readLineStdout(); + TQString line = externalProcess->readLineStdout(); if (line.isEmpty()) continue; // See if it already exists bool exists = false; - for ( QListViewItem * myChild = appList->firstChild() ; myChild != NULL ; myChild = myChild->nextSibling()) + for ( TQListViewItem * myChild = appList->firstChild() ; myChild != NULL ; myChild = myChild->nextSibling()) { if (myChild->rtti() != 1003) continue; @@ -237,7 +237,7 @@ void UninstallWizard::readyReadStdout() if (exists) continue; - QString niceName = line.left(line.findRev(':')); + TQString niceName = line.left(line.findRev(':')); niceName = niceName.left(1).upper() + niceName.right(niceName.length()-1); new AppListItem(niceName, line, appList); @@ -254,7 +254,7 @@ void UninstallWizard::readyReadStdout() { while (externalProcess->canReadLineStdout()) { - QString line = externalProcess->readLineStdout(); + TQString line = externalProcess->readLineStdout(); if (line.isEmpty()) continue; fileList->insertItem(icon, line.left(line.find(" "))); @@ -264,10 +264,10 @@ void UninstallWizard::readyReadStdout() case RemovingGlobal: while (externalProcess->canReadLineStdout()) { - QString line = externalProcess->readLineStdout(); + TQString line = externalProcess->readLineStdout(); if (line.isEmpty()) continue; - line.replace(QRegExp("\\033[^m]*m"), ""); + line.replace(TQRegExp("\\033[^m]*m"), ""); logDialog->logBox->append(line); } break; @@ -278,10 +278,10 @@ void UninstallWizard::readyReadStderr() { while (externalProcess->canReadLineStdout()) { - QString line = externalProcess->readLineStdout(); + TQString line = externalProcess->readLineStdout(); if (line.isEmpty()) continue; - line.replace(QRegExp("\\033[^m]*m"), ""); + line.replace(TQRegExp("\\033[^m]*m"), ""); logDialog->logBox->append(line); } } @@ -292,10 +292,10 @@ void UninstallWizard::removeUserPackages() previousButton->setEnabled(false); // Find out which packages belong to the user, and uninstall them - QStringList argList; + TQStringList argList; argList.append("/bin/sh"); argList.append("/tmp/arkollon-uninstall.sh"); - for ( QListViewItem * myChild = appList->firstChild() ; myChild != NULL ; myChild = myChild->nextSibling()) + for ( TQListViewItem * myChild = appList->firstChild() ; myChild != NULL ; myChild = myChild->nextSibling()) { if (myChild->rtti() != 1003) continue; diff --git a/src/arkollon/uninstallwizard.h b/src/arkollon/uninstallwizard.h index 711e04f..712dc37 100644 --- a/src/arkollon/uninstallwizard.h +++ b/src/arkollon/uninstallwizard.h @@ -25,20 +25,20 @@ #include "logdialog.h" #include "headerlistitem.h" -#include <qlistview.h> -#include <qprocess.h> -#include <qpixmap.h> +#include <ntqlistview.h> +#include <ntqprocess.h> +#include <ntqpixmap.h> -class AppListItem : public QCheckListItem +class AppListItem : public TQCheckListItem { public: - AppListItem(QString nN, QString n, QListView* lv); - int compare(QListViewItem* i, int col, bool ascending) const; + AppListItem(TQString nN, TQString n, TQListView* lv); + int compare(TQListViewItem* i, int col, bool ascending) const; int rtti() const { return 1003; } - QString niceName; - QString name; + TQString niceName; + TQString name; int section; }; @@ -49,7 +49,7 @@ class UninstallWizard : public WizardBase Q_OBJECT public: - UninstallWizard(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + UninstallWizard(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~UninstallWizard(); public slots: @@ -77,10 +77,10 @@ private: } currentStage; LogDialog* logDialog; - QProcess* externalProcess; + TQProcess* externalProcess; HeaderListItem* globalHeader; - QPixmap icon; + TQPixmap icon; }; #endif diff --git a/src/arkollon/wizard.cpp b/src/arkollon/wizard.cpp index 8e92ebf..ae6b94b 100644 --- a/src/arkollon/wizard.cpp +++ b/src/arkollon/wizard.cpp @@ -19,35 +19,35 @@ ***************************************************************************/ #include "wizard.h" -#include <qfiledialog.h> -#include <qwidgetstack.h> -#include <qpushbutton.h> -#include <qpainter.h> -#include <qheader.h> -#include <qapplication.h> -#include <qmessagebox.h> -#include <qprogressbar.h> -#include <qradiobutton.h> -#include <qtextedit.h> -#include <qlineedit.h> -#include <qpopupmenu.h> -#include <qhbox.h> -#include <qfileinfo.h> -#include <qlabel.h> -#include <qfontmetrics.h> -#include <qcheckbox.h> +#include <ntqfiledialog.h> +#include <ntqwidgetstack.h> +#include <ntqpushbutton.h> +#include <ntqpainter.h> +#include <ntqheader.h> +#include <ntqapplication.h> +#include <ntqmessagebox.h> +#include <ntqprogressbar.h> +#include <ntqradiobutton.h> +#include <ntqtextedit.h> +#include <ntqlineedit.h> +#include <ntqpopupmenu.h> +#include <ntqhbox.h> +#include <ntqfileinfo.h> +#include <ntqlabel.h> +#include <ntqfontmetrics.h> +#include <ntqcheckbox.h> #include "data.h" #include "rcparser.h" #include "headerlistitem.h" -typedef QValueVector<CompileError> CompileErrorVector; +typedef TQValueVector<CompileError> CompileErrorVector; CompileErrorVector errs( 5 ); // vector of 3 Employees -ComponentListItem::ComponentListItem(struct Component c, QListView* parent) - : QCheckListItem(parent, "", QCheckListItem::CheckBox) +ComponentListItem::ComponentListItem(struct Component c, TQListView* parent) + : TQCheckListItem(parent, "", TQCheckListItem::CheckBox) { component = c; setText(0, c.niceName); @@ -65,7 +65,7 @@ ComponentListItem::ComponentListItem(struct Component c, QListView* parent) } -int ComponentListItem::compare(QListViewItem* i, int col, bool ascending) const +int ComponentListItem::compare(TQListViewItem* i, int col, bool ascending) const { switch (i->rtti()) { @@ -76,7 +76,7 @@ int ComponentListItem::compare(QListViewItem* i, int col, bool ascending) const return -1; if (section > item->section) return 1; - return QListViewItem::compare(i, col, ascending); + return TQListViewItem::compare(i, col, ascending); } break; @@ -94,13 +94,13 @@ int ComponentListItem::compare(QListViewItem* i, int col, bool ascending) const -Wizard::Wizard(QWidget *parent, const char *name) +Wizard::Wizard(TQWidget *parent, const char *name) : WizardBase(parent, name, false, WDestructiveClose) { componentInfo->setMaximumSize(32767,70); componentList->header()->hide(); //progressLabel2->setMaximumSize(32767, progressLabel2->fontMetrics().height()*2); - externalProcess = new QProcess(this); + externalProcess = new TQProcess(this); connect(externalProcess, SIGNAL(processExited()), SLOT(processExited())); connect(externalProcess, SIGNAL(readyReadStdout()), SLOT(readyReadStdout())); connect(externalProcess, SIGNAL(readyReadStderr()), SLOT(readyReadStderr())); @@ -111,7 +111,7 @@ Wizard::Wizard(QWidget *parent, const char *name) createActionFormats(); - kdeDirProcess = new QProcess(this); + kdeDirProcess = new TQProcess(this); connect(kdeDirProcess, SIGNAL(readyReadStdout()), SLOT(kdeDirReady())); connect(kdeDirProcess, SIGNAL(processExited()), SLOT(getInstalledComponents())); kdeDirProcess->addArgument("kde-config"); @@ -132,7 +132,7 @@ Wizard::Wizard(QWidget *parent, const char *name) errs[3] = CompileError( "installing config files as root", "The installation reported an" "error because I attempted to install the privoxy config files as root. <b> There is no " "need to take any action on your part. Privoxy has been installed and you can now use it with TorK. " ); - errs[4] = CompileError( "Qt (>= ", "The installation process finished with an error because it needs a " + errs[4] = CompileError( "TQt (>= ", "The installation process finished with an error because it needs a " " component missing on your system. To correct this, " "do the following: <br> 1. Download and install any packages for your distribution with (i) 'qt' and " " either 'devel' or 'lib' in their name. <br> 2. Retry installation. " ); @@ -168,7 +168,7 @@ void Wizard::kdeDirReady() { while (kdeDirProcess->canReadLineStdout()) { - QString line = kdeDirProcess->readLineStdout(); + TQString line = kdeDirProcess->readLineStdout(); if (!line.isEmpty()) kdeDir = line; } @@ -176,15 +176,15 @@ void Wizard::kdeDirReady() void Wizard::getInstalledComponents() { - QFile uninstallScript("/tmp/arkollon-uninstall.sh"); + TQFile uninstallScript("/tmp/arkollon-uninstall.sh"); if (uninstallScript.exists()) uninstallScript.remove(); uninstallScript.open(IO_WriteOnly); - QDataStream stream(&uninstallScript); + TQDataStream stream(&uninstallScript); stream.writeRawBytes((const char*)uninstaller_sh_data, uninstaller_sh_len); uninstallScript.close(); - installedComponentsProcess = new QProcess(this); + installedComponentsProcess = new TQProcess(this); connect(installedComponentsProcess, SIGNAL(readyReadStdout()), SLOT(installedComponentsReady())); connect(installedComponentsProcess, SIGNAL(processExited()), SLOT(setup())); installedComponentsProcess->addArgument("/bin/sh"); @@ -198,7 +198,7 @@ void Wizard::installedComponentsReady() { while (installedComponentsProcess->canReadLineStdout()) { - QString line = installedComponentsProcess->readLineStdout(); + TQString line = installedComponentsProcess->readLineStdout(); if (line.isEmpty()) continue; @@ -213,7 +213,7 @@ void Wizard::installedComponentsReady() void Wizard::setup() { - QFile uninstallScript("/tmp/arkollon-uninstall.sh"); + TQFile uninstallScript("/tmp/arkollon-uninstall.sh"); if (uninstallScript.exists()) uninstallScript.remove(); @@ -222,14 +222,14 @@ void Wizard::setup() // Firstly check if there's an arkollonrc file in the current directory // If there is, use it. - dir = QDir::currentDirPath(); - if (qApp->argc() > 1) + dir = TQDir::currentDirPath(); + if (tqApp->argc() > 1) { // The directory specified on the command line overrides the current dir. - QDir d(qApp->argv()[1]); + TQDir d(tqApp->argv()[1]); dir = d.absPath(); } - if (QFile::exists(dir + "/arkollonrc")) + if (TQFile::exists(dir + "/arkollonrc")) { setupFromRc(); } @@ -237,7 +237,7 @@ void Wizard::setup() { if (!setupFromDir()) { - QMessageBox::critical(NULL, "Error", "This directory does not contain any recognised buildsystem", QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::critical(NULL, "Error", "This directory does not contain any recognised buildsystem", TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); reject(); return; } @@ -251,37 +251,37 @@ void Wizard::setupFromRc() parser.addSearchDir(dir); if (!parser.openFile("arkollonrc")) { - QMessageBox::critical(NULL, "Error", "The \"arkollonrc\" file in this directory could not be read", QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::critical(NULL, "Error", "The \"arkollonrc\" file in this directory could not be read", TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); reject(); return; } parser.setSection("Arkollon"); - QString appName = parser.readString("AppName"); + TQString appName = parser.readString("AppName"); if (appName.isEmpty()) { - QMessageBox::critical(NULL, "Error", "The \"arkollonrc\" file in this directory contains no application name!", QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::critical(NULL, "Error", "The \"arkollonrc\" file in this directory contains no application name!", TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); reject(); return; } setAppName(appName); - QString icon32Path = parser.readString("Icon32"); - QString icon16Path = parser.readString("Icon16"); - if ((!icon32Path.isEmpty()) && (QFile::exists(dir + "/" + icon32Path))) + TQString icon32Path = parser.readString("Icon32"); + TQString icon16Path = parser.readString("Icon16"); + if ((!icon32Path.isEmpty()) && (TQFile::exists(dir + "/" + icon32Path))) { - QPixmap icon32(dir + "/" + icon32Path); + TQPixmap icon32(dir + "/" + icon32Path); appIcon->setPixmap(icon32); } - if ((!icon16Path.isEmpty()) && (QFile::exists(dir + "/" + icon16Path))) + if ((!icon16Path.isEmpty()) && (TQFile::exists(dir + "/" + icon16Path))) { - QPixmap icon16(dir + "/" + icon16Path); + TQPixmap icon16(dir + "/" + icon16Path); setIcon(icon16); } buildOrder = parser.readList("BuildOrder"); - QStringList compNames = parser.readList("Components"); - QStringList::Iterator it = compNames.begin(); + TQStringList compNames = parser.readList("Components"); + TQStringList::Iterator it = compNames.begin(); while( it != compNames.end() ) { parser.setSection(*it); @@ -299,15 +299,15 @@ void Wizard::setupFromRc() c.alreadyInstalled = false; // Load the buildtimes data - if (QFile::exists(dir + "/" + c.subDir + "/buildtimes")) + if (TQFile::exists(dir + "/" + c.subDir + "/buildtimes")) { - QRegExp re("([^,]*,[^,]*),(\\d*)"); - QFile file(dir + "/" + c.subDir + "/buildtimes"); + TQRegExp re("([^,]*,[^,]*),(\\d*)"); + TQFile file(dir + "/" + c.subDir + "/buildtimes"); file.open(IO_ReadOnly); - QTextStream stream(&file); + TQTextStream stream(&file); for (;;) { - QString line = stream.readLine(); + TQString line = stream.readLine(); if (line.isNull()) break; if (re.search(line) == -1) @@ -333,13 +333,13 @@ void Wizard::setupFromRc() } // Check if it's already installed - QStringList::Iterator it2 = installedComponents.begin(); + TQStringList::Iterator it2 = installedComponents.begin(); while( it2 != installedComponents.end() ) { int dashPos = c.subDir.findRev('-'); if (dashPos < 0) dashPos = c.subDir.length(); - QString version = c.subDir.left(dashPos) + ":" + c.subDir.right(c.subDir.length() - dashPos - 1); + TQString version = c.subDir.left(dashPos) + ":" + c.subDir.right(c.subDir.length() - dashPos - 1); if (*it2 == version.lower()) { item->setOn(false); @@ -357,18 +357,18 @@ void Wizard::setupFromRc() bool Wizard::setupFromDir() { - if ((!QFile::exists(dir + "/configure")) && - (!QFile::exists(dir + "/autogen.sh")) && - (!QFile::exists(dir + "/auto-gen.sh"))) + if ((!TQFile::exists(dir + "/configure")) && + (!TQFile::exists(dir + "/autogen.sh")) && + (!TQFile::exists(dir + "/auto-gen.sh"))) { - QDir myDir(dir + "/" + selectedComponents[currentComponent].subDir); - if (myDir.entryList("*.pro", QDir::Files).count() <= 0) + TQDir myDir(dir + "/" + selectedComponents[currentComponent].subDir); + if (myDir.entryList("*.pro", TQDir::Files).count() <= 0) return false; } // Use the directory name as the appname - QDir myDir2(dir); - QString dirName = myDir2.dirName(); + TQDir myDir2(dir); + TQString dirName = myDir2.dirName(); setAppName(makeDirNice(dirName)); buildOrder.append(dirName); @@ -386,13 +386,13 @@ bool Wizard::setupFromDir() header->setText(0, "Required components"); header->section = 0; - QStringList::Iterator it2 = installedComponents.begin(); + TQStringList::Iterator it2 = installedComponents.begin(); while( it2 != installedComponents.end() ) { int dashPos = dirName.findRev('-'); if (dashPos < 0) dashPos = dirName.length(); - QString version = dirName.left(dashPos) + ":" + dirName.right(dirName.length() - dashPos - 1); + TQString version = dirName.left(dashPos) + ":" + dirName.right(dirName.length() - dashPos - 1); if (*it2 == version.lower()) item->component.alreadyInstalled = true; ++it2; @@ -407,13 +407,13 @@ Wizard::~Wizard() } -void Wizard::componentSelected(QListViewItem* item) +void Wizard::componentSelected(TQListViewItem* item) { if (item->rtti() != 1001) return; ComponentListItem* i = (ComponentListItem*) item; - QString text = "<p><b>" + item->text(0) + "</b>"; + TQString text = "<p><b>" + item->text(0) + "</b>"; if (i->component.alreadyInstalled) text += " <i>(Already installed)</i>"; text += "</p><p>"; @@ -424,13 +424,13 @@ void Wizard::componentSelected(QListViewItem* item) } -QString Wizard::makeDirNice(QString name) +TQString Wizard::makeDirNice(TQString name) { int dashPos = name.findRev('-'); if (dashPos < 0) dashPos = name.length(); - QString ret = name.left(dashPos); + TQString ret = name.left(dashPos); ret = ret.left(1).upper() + ret.right(ret.length()-1); return ret; @@ -450,32 +450,32 @@ void Wizard::nextPressed() int currentId = installStack->id(installStack->visibleWidget()); if (currentId == 3) { - QDir d(kdeDir); + TQDir d(kdeDir); d.mkdir("share/apps/kdesktop/Desktop"); if (shortcutBox->isChecked()) { - QFile source(dir + "/" + desktop); - QString destDir = kdeDir + "/share/apps/kdesktop/Desktop"; + TQFile source(dir + "/" + desktop); + TQString destDir = kdeDir + "/share/apps/kdesktop/Desktop"; int slashPos = desktop.findRev('/'); if (slashPos < 0) slashPos = 0; - QFile dest(destDir + "/" + desktop.right(desktop.length() - slashPos)); + TQFile dest(destDir + "/" + desktop.right(desktop.length() - slashPos)); source.open(IO_ReadOnly); dest.open(IO_WriteOnly | IO_Truncate); - QDataStream destStream(&dest); - QByteArray data = source.readAll(); + TQDataStream destStream(&dest); + TQByteArray data = source.readAll(); destStream.writeRawBytes(data.data(), data.size()); source.close(); dest.close(); } if (uninstallBox->isChecked()) { - QFile source(dir + "/Uninstall TorK.desktop"); - QFile dest(kdeDir + "/share/apps/kdesktop/Desktop/Uinstall TorK.desktop"); + TQFile source(dir + "/Uninstall TorK.desktop"); + TQFile dest(kdeDir + "/share/apps/kdesktop/Desktop/Uinstall TorK.desktop"); source.open(IO_ReadOnly); dest.open(IO_WriteOnly | IO_Truncate); - QDataStream destStream(&dest); - QByteArray data = source.readAll(); + TQDataStream destStream(&dest); + TQByteArray data = source.readAll(); destStream.writeRawBytes(data.data(), data.size()); source.close(); dest.close(); @@ -493,7 +493,7 @@ void Wizard::nextPressed() { bool itemsSelected = false; - QListViewItemIterator it( componentList ); + TQListViewItemIterator it( componentList ); while ( it.current() ) { if (it.current()->rtti() != 1001) @@ -508,7 +508,7 @@ void Wizard::nextPressed() } if (!itemsSelected) { - QMessageBox::warning(this, "Warning", "You need to select at least one component", QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::warning(this, "Warning", "You need to select at least one component", TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); return; } } @@ -552,9 +552,9 @@ void Wizard::startProcess() totalBTime = 0; elapsedTime = 0; elapsedBTime = 0; - for ( QStringList::Iterator it = buildOrder.begin(); it != buildOrder.end(); ++it ) + for ( TQStringList::Iterator it = buildOrder.begin(); it != buildOrder.end(); ++it ) { - QListViewItemIterator it2( componentList ); + TQListViewItemIterator it2( componentList ); while ( it2.current() ) { if (it2.current()->rtti() != 1001) @@ -568,7 +568,7 @@ void Wizard::startProcess() if (item->isOn()) { selectedComponents.append(item->component); - QMap<QString, uint>::iterator it3; + TQMap<TQString, uint>::iterator it3; for ( it3 = item->component.buildTimes.begin(); it3 != item->component.buildTimes.end(); ++it3 ) totalBTime += it3.data(); } @@ -582,7 +582,7 @@ void Wizard::startProcess() currentComponent = 0; currentStage = None; - currentIsQMake = false; + currentIsTQMake = false; nextStep(); } @@ -600,24 +600,24 @@ void Wizard::nextStep() setProgress2Text(""); //progressLabel2->setCursorPosition(0); currentStage = Autogen; - QDir myDir(dir + "/" + selectedComponents[currentComponent].subDir); - if (myDir.entryList("*.pro", QDir::Files).count() > 0) + TQDir myDir(dir + "/" + selectedComponents[currentComponent].subDir); + if (myDir.entryList("*.pro", TQDir::Files).count() > 0) { - currentIsQMake = true; + currentIsTQMake = true; nextStep(); return; } - if (QFile::exists(dir + "/" + selectedComponents[currentComponent].subDir + "/configure")) + if (TQFile::exists(dir + "/" + selectedComponents[currentComponent].subDir + "/configure")) { nextStep(); return; } - QString autogenName; - if (QFile::exists(dir + "/" + selectedComponents[currentComponent].subDir + "/autogen.sh")) + TQString autogenName; + if (TQFile::exists(dir + "/" + selectedComponents[currentComponent].subDir + "/autogen.sh")) autogenName = "autogen.sh"; - else if (QFile::exists(dir + "/" + selectedComponents[currentComponent].subDir + "/auto-gen.sh")) + else if (TQFile::exists(dir + "/" + selectedComponents[currentComponent].subDir + "/auto-gen.sh")) autogenName = "auto-gen.sh"; else { @@ -636,7 +636,7 @@ void Wizard::nextStep() { //progressBar->setProgress(progressBar->progress() + 1); currentStage = Configure; - if (currentIsQMake) + if (currentIsTQMake) { progressLabel1->setText("<b>Running qmake for " + selectedComponents[currentComponent].niceName + "</b>"); setProgress2Text(""); @@ -645,7 +645,7 @@ void Wizard::nextStep() externalProcess->setWorkingDirectory(dir + "/" + selectedComponents[currentComponent].subDir); if (!externalProcess->start()) { - logLine("Error: qmake was not found. Try installing the Qt-devel libraries."); + logLine("Error: qmake was not found. Try installing the TQt-devel libraries."); errorOccured(); return; } @@ -662,8 +662,8 @@ void Wizard::nextStep() //externalProcess->addArgument("--prefix=" + prefix); if (!selectedComponents[currentComponent].confOptions.isEmpty()) { - QStringList extraArgs = QStringList::split(" ", sub(selectedComponents[currentComponent].confOptions)); - for ( QStringList::Iterator it = extraArgs.begin(); it != extraArgs.end(); ++it ) + TQStringList extraArgs = TQStringList::split(" ", sub(selectedComponents[currentComponent].confOptions)); + for ( TQStringList::Iterator it = extraArgs.begin(); it != extraArgs.end(); ++it ) externalProcess->addArgument(*it); } externalProcess->setWorkingDirectory(dir + "/" + selectedComponents[currentComponent].subDir); @@ -713,25 +713,25 @@ void Wizard::nextStep() progressLabel1->setText("<b>Writing uninstall information for " + selectedComponents[currentComponent].niceName + "</b>"); setProgress2Text(""); - QFile postInstallScript("/tmp/arkollon-postinstall.sh"); + TQFile postInstallScript("/tmp/arkollon-postinstall.sh"); if (postInstallScript.exists()) postInstallScript.remove(); postInstallScript.open(IO_WriteOnly); - QDataStream stream(&postInstallScript); + TQDataStream stream(&postInstallScript); stream.writeRawBytes((const char*)postinstall_sh_data, postinstall_sh_len); postInstallScript.close(); - QFile fileList("/tmp/arkollon-filelist"); + TQFile fileList("/tmp/arkollon-filelist"); if (fileList.exists()) fileList.remove(); fileList.open(IO_WriteOnly); - QTextStream fileStream(&fileList); - QStringList doneFiles; - for ( QStringList::Iterator it = installedFiles.begin(); it != installedFiles.end(); ++it ) + TQTextStream fileStream(&fileList); + TQStringList doneFiles; + for ( TQStringList::Iterator it = installedFiles.begin(); it != installedFiles.end(); ++it ) { if (doneFiles.find(*it) != doneFiles.end()) continue; - QFileInfo fileInfo(*it); + TQFileInfo fileInfo(*it); if (fileInfo.isDir()) continue; fileStream << (*it) << '\n'; @@ -743,8 +743,8 @@ void Wizard::nextStep() int dashPos = c.subDir.findRev('-'); if (dashPos < 0) dashPos = c.subDir.length(); - QString appname = c.subDir.left(dashPos); - QString version = c.subDir.right(c.subDir.length() - dashPos - 1); + TQString appname = c.subDir.left(dashPos); + TQString version = c.subDir.right(c.subDir.length() - dashPos - 1); externalProcess->addArgument("/bin/sh"); externalProcess->addArgument("/tmp/arkollon-postinstall.sh"); @@ -761,7 +761,7 @@ void Wizard::nextStep() { currentStage = None; currentComponent++; - currentIsQMake = false; + currentIsTQMake = false; if (currentComponent >= selectedComponents.count()) { progressLabel1->setText("<b>Installation completed!</b>"); @@ -794,11 +794,11 @@ void Wizard::processExited() if (currentStage == WriteUninstallInfo) { // Remove temp files from the last stage - QFile postInstallScript("/tmp/arkollon-postinstall.sh"); + TQFile postInstallScript("/tmp/arkollon-postinstall.sh"); if (postInstallScript.exists()) postInstallScript.remove(); - QFile fileList("/tmp/arkollon-filelist"); + TQFile fileList("/tmp/arkollon-filelist"); if (fileList.exists()) fileList.remove(); } @@ -810,7 +810,7 @@ void Wizard::processExited() } if (externalProcess->exitStatus() != 0) { - logLine("Return value " + QString::number(externalProcess->exitStatus())); + logLine("Return value " + TQString::number(externalProcess->exitStatus())); errorOccured(); return; } @@ -823,11 +823,11 @@ void Wizard::readyReadStderr() { while (externalProcess->canReadLineStderr()) { - QString line = externalProcess->readLineStderr().latin1(); + TQString line = externalProcess->readLineStderr().latin1(); CompileErrorVector::iterator it; for( it = errs.begin(); it != errs.end(); ++it ){ if (line.contains((*it).type())) - QMessageBox::information( this, (*it).type(), (*it).message() ); + TQMessageBox::information( this, (*it).type(), (*it).message() ); } logDialog->logBox->append(" * "+line); } @@ -837,7 +837,7 @@ void Wizard::readyReadStdout() { while (externalProcess->canReadLineStdout()) { - QString line = externalProcess->readLineStdout().latin1(); + TQString line = externalProcess->readLineStdout().latin1(); logDialog->logBox->append(line); if (currentStage == Configure) @@ -849,7 +849,7 @@ void Wizard::readyReadStdout() if (line.right(1) == "\\") continue; commandLine = commandLine.left(commandLine.find(';')); - for ( QValueList<ActionFormat>::Iterator it = actionFormats.begin(); it != actionFormats.end(); ++it ) + for ( TQValueList<ActionFormat>::Iterator it = actionFormats.begin(); it != actionFormats.end(); ++it ) { if ((*it).regExp.search(commandLine) == -1) continue; @@ -864,7 +864,7 @@ void Wizard::readyReadStdout() } } -void Wizard::updateTime(QString key) +void Wizard::updateTime(TQString key) { if (!timer.isNull()) { @@ -874,7 +874,7 @@ void Wizard::updateTime(QString key) int remainingTime = (int)((float)(totalBTime - elapsedBTime) * ratio) / 60000; if (remainingTime < 0) remainingTime = 0; - QString text = QString::number(remainingTime + 1) + " minutes"; + TQString text = TQString::number(remainingTime + 1) + " minutes"; if (remainingTime == 0) text = "1 minute"; timeRemaining->setText("Estimated time remaining: <b>" + text + "</b>"); @@ -883,11 +883,11 @@ void Wizard::updateTime(QString key) timer.start(); } -void Wizard::logLine(QString line) +void Wizard::logLine(TQString line) { - QString tmp = line; - QStringList lines = QStringList::split("\n", tmp); - for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) + TQString tmp = line; + TQStringList lines = TQStringList::split("\n", tmp); + for ( TQStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -895,14 +895,14 @@ void Wizard::logLine(QString line) } } -void Wizard::setProgress2Text(QString text) +void Wizard::setProgress2Text(TQString text) { - QString croppedText = text; + TQString croppedText = text; int i = croppedText.length(); - QFont boldFont = progressLabel2->font(); + TQFont boldFont = progressLabel2->font(); boldFont.setBold(true); - QFontMetrics boldFontMetrics(boldFont); + TQFontMetrics boldFontMetrics(boldFont); while (boldFontMetrics.width(croppedText) > progressLabel2->width()) { croppedText = croppedText.left(--i); @@ -920,24 +920,24 @@ void Wizard::errorOccured() previousButton->setEnabled(true); } -QString Wizard::sub(QString s) +TQString Wizard::sub(TQString s) { - QString tmp = s; - tmp.replace(QRegExp("\\$KDEDIR"), kdeDir); - tmp.replace(QRegExp("\\$HOMEDIR"), QDir::homeDirPath()); - tmp.replace(QRegExp("~"), QDir::homeDirPath()); - tmp.replace(QRegExp("\\$PREFIX"), "/usr/local"); + TQString tmp = s; + tmp.replace(TQRegExp("\\$KDEDIR"), kdeDir); + tmp.replace(TQRegExp("\\$HOMEDIR"), TQDir::homeDirPath()); + tmp.replace(TQRegExp("~"), TQDir::homeDirPath()); + tmp.replace(TQRegExp("\\$PREFIX"), "/usr/local"); return tmp; } void Wizard::runPressed() { - QProcess* proc = new QProcess(this); + TQProcess* proc = new TQProcess(this); proc->addArgument(exec); if (!proc->start()) { - QMessageBox::warning(this, "Warning", "The application could not be started<br>"+exec, QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton); + TQMessageBox::warning(this, "Warning", "The application could not be started<br>"+exec, TQMessageBox::Ok, TQMessageBox::NoButton, TQMessageBox::NoButton); } } diff --git a/src/arkollon/wizard.h b/src/arkollon/wizard.h index cf32d9d..09e0ef9 100644 --- a/src/arkollon/wizard.h +++ b/src/arkollon/wizard.h @@ -21,13 +21,13 @@ #define WIZARD_H #include <wizardbase.h> -#include <qlistview.h> -#include <qprocess.h> -#include <qsettings.h> -#include <qiconview.h> -#include <qregexp.h> -#include <qvaluevector.h> -#include <qstring.h> +#include <ntqlistview.h> +#include <ntqprocess.h> +#include <ntqsettings.h> +#include <ntqiconview.h> +#include <ntqregexp.h> +#include <ntqvaluevector.h> +#include <ntqstring.h> #include <stdio.h> #include "logdialog.h" @@ -35,26 +35,26 @@ class HeaderListItem; struct Component { - QString name; - QString niceName; - QString subDir; - QString forceDir; + TQString name; + TQString niceName; + TQString subDir; + TQString forceDir; bool optional; bool kdeOnly; bool gnomeOnly; - QString description; - QString confOptions; + TQString description; + TQString confOptions; - QMap<QString, uint> buildTimes; + TQMap<TQString, uint> buildTimes; bool alreadyInstalled; }; -class ComponentListItem : public QCheckListItem +class ComponentListItem : public TQCheckListItem { public: - ComponentListItem(struct Component c, QListView* parent); - int compare(QListViewItem* i, int col, bool ascending) const; + ComponentListItem(struct Component c, TQListView* parent); + int compare(TQListViewItem* i, int col, bool ascending) const; int rtti() const { return 1001; } struct Component component; @@ -65,12 +65,12 @@ class ActionFormat { public: ActionFormat() {} - ActionFormat(QString a, QString t, QString r, int) { action=a; tool=t; regExp=r; } + ActionFormat(TQString a, TQString t, TQString r, int) { action=a; tool=t; regExp=r; } ~ActionFormat() {} - QString action; - QString tool; - QRegExp regExp; + TQString action; + TQString tool; + TQRegExp regExp; }; @@ -78,15 +78,15 @@ class CompileError { public: CompileError() {} - CompileError( const QString& type, const QString& message ) + CompileError( const TQString& type, const TQString& message ) : t( type ), m( message ) { } - QString type() const { return t; } - QString message() const { return m; } + TQString type() const { return t; } + TQString message() const { return m; } private: - QString t; - QString m; + TQString t; + TQString m; }; @@ -96,7 +96,7 @@ class Wizard : public WizardBase Q_OBJECT public: - Wizard(QWidget *parent = 0, const char *name = 0); + Wizard(TQWidget *parent = 0, const char *name = 0); ~Wizard(); @@ -107,16 +107,16 @@ private: void nextStep(); void checkPassword(); - void updateTime(QString key); - QString lastTimeLine; + void updateTime(TQString key); + TQString lastTimeLine; - void logLine(QString line); + void logLine(TQString line); void errorOccured(); - QString makeDirNice(QString name); + TQString makeDirNice(TQString name); - QString sub(QString s); + TQString sub(TQString s); - QString rootPassword; + TQString rootPassword; private slots: void processExited(); @@ -131,8 +131,8 @@ private slots: void previousPressed(); void runPressed(); void logPressed(); - void componentSelected(QListViewItem* item); - void setProgress2Text(QString text); + void componentSelected(TQListViewItem* item); + void setProgress2Text(TQString text); void setup(); void setupFromRc(); @@ -149,34 +149,34 @@ private: WriteUninstallInfo }; - QString dir; - QStringList buildOrder; - QValueList<struct Component> selectedComponents; + TQString dir; + TQStringList buildOrder; + TQValueList<struct Component> selectedComponents; uint totalBTime; uint elapsedBTime; uint elapsedTime; - QTime timer; - QProcess* externalProcess; - QProcess* kdeDirProcess; - QProcess* installedComponentsProcess; - QString commandLine; - bool currentIsQMake; + TQTime timer; + TQProcess* externalProcess; + TQProcess* kdeDirProcess; + TQProcess* installedComponentsProcess; + TQString commandLine; + bool currentIsTQMake; uint currentComponent; enum Stage currentStage; bool needRoot; - QString prefix; + TQString prefix; - QStringList installedComponents; - QString exec; - QString desktop; + TQStringList installedComponents; + TQString exec; + TQString desktop; - QString kdeDir; + TQString kdeDir; LogDialog* logDialog; - QMap<int, HeaderListItem*> headers; - QValueList<ActionFormat> actionFormats; - QStringList installedFiles; + TQMap<int, HeaderListItem*> headers; + TQValueList<ActionFormat> actionFormats; + TQStringList installedFiles; }; diff --git a/src/arkollon/wizardbase.ui b/src/arkollon/wizardbase.ui index 6fc9d12..e359fb3 100644 --- a/src/arkollon/wizardbase.ui +++ b/src/arkollon/wizardbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>WizardBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>WizardBase</cstring> </property> @@ -36,7 +36,7 @@ <property name="resizeMode"> <enum>Fixed</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>splash</cstring> </property> @@ -66,7 +66,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -74,7 +74,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>titleLabel</cstring> </property> @@ -107,11 +107,11 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>mainStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -128,11 +128,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>installStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Introduction</cstring> </property> @@ -143,7 +143,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -154,7 +154,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout12</cstring> </property> @@ -179,7 +179,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>appIcon</cstring> </property> @@ -187,7 +187,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>appNameLabel</cstring> </property> @@ -222,7 +222,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -249,7 +249,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Components</cstring> </property> @@ -260,7 +260,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -271,7 +271,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Component name</string> @@ -287,7 +287,7 @@ <cstring>componentList</cstring> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>componentInfo</cstring> </property> @@ -306,7 +306,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -317,7 +317,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pleaseWaitLabel</cstring> </property> @@ -345,7 +345,7 @@ </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>progressLabel1</cstring> </property> @@ -353,7 +353,7 @@ <string>Progress Label 1</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>progressLabel2</cstring> </property> @@ -375,7 +375,7 @@ <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> - <widget class="QProgressBar"> + <widget class="TQProgressBar"> <property name="name"> <cstring>progressBar</cstring> </property> @@ -383,7 +383,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeRemaining</cstring> </property> @@ -411,7 +411,7 @@ </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>logFrame</cstring> </property> @@ -456,7 +456,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>logButton</cstring> </property> @@ -468,7 +468,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -479,7 +479,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -507,7 +507,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout7</cstring> </property> @@ -532,7 +532,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>uninstallBox</cstring> </property> @@ -543,7 +543,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>shortcutBox</cstring> </property> @@ -578,7 +578,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -595,11 +595,11 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>uninstallStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -610,7 +610,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -618,7 +618,7 @@ <string>Please select from the list below the applications you wish to uninstall.</string> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Application Name</string> @@ -636,7 +636,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -647,7 +647,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_3</cstring> </property> @@ -659,14 +659,14 @@ Please check this list, and click <b>next</b> to continue.</string> <enum>RichText</enum> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>fileList</cstring> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -694,7 +694,7 @@ Please check this list, and click <b>next</b> to continue.</string> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pleaseWaitLabel2</cstring> </property> @@ -719,7 +719,7 @@ Please check this list, and click <b>next</b> to continue.</string> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>logFrame_2</cstring> </property> @@ -764,7 +764,7 @@ Please check this list, and click <b>next</b> to continue.</string> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>logButton2</cstring> </property> @@ -798,7 +798,7 @@ Please check this list, and click <b>next</b> to continue.</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -823,7 +823,7 @@ Please check this list, and click <b>next</b> to continue.</string> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>previousButton</cstring> </property> @@ -834,7 +834,7 @@ Please check this list, and click <b>next</b> to continue.</string> <string>< Previous</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>nextButton</cstring> </property> @@ -845,7 +845,7 @@ Please check this list, and click <b>next</b> to continue.</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>cancelButton</cstring> </property> @@ -872,9 +872,9 @@ Please check this list, and click <b>next</b> to continue.</string> </connection> <connection> <sender>componentList</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>WizardBase</receiver> - <slot>componentSelected(QListViewItem*)</slot> + <slot>componentSelected(TQListViewItem*)</slot> </connection> <connection> <sender>logButton</sender> @@ -905,17 +905,17 @@ Please check this list, and click <b>next</b> to continue.</string> </tabstops> <includes> <include location="local" impldecl="in implementation">wizardbase.ui.h</include> - <include location="global" impldecl="in implementation">qwidgetstack.h</include> + <include location="global" impldecl="in implementation">ntqwidgetstack.h</include> </includes> <slots> - <slot>setAppName( QString n )</slot> + <slot>setAppName( TQString n )</slot> <slot>nextPressed()</slot> <slot>previousPressed()</slot> <slot>cancelPressed()</slot> <slot>browsePressed()</slot> <slot>runPressed()</slot> <slot>logPressed()</slot> - <slot>componentSelected( QListViewItem * item )</slot> + <slot>componentSelected( TQListViewItem * item )</slot> </slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/arkollon/wizardbase.ui.h b/src/arkollon/wizardbase.ui.h index 2fd5bce..261dafc 100644 --- a/src/arkollon/wizardbase.ui.h +++ b/src/arkollon/wizardbase.ui.h @@ -1,8 +1,8 @@ #include "data.h" -void WizardBase::setAppName( QString n ) +void WizardBase::setAppName( TQString n ) { - QPixmap tmp; + TQPixmap tmp; tmp.convertFromImage(qembed_findImage("packageIcon")); appIcon->setPixmap(tmp); tmp.convertFromImage(qembed_findImage("splash")); @@ -52,7 +52,7 @@ void WizardBase::logPressed() -void WizardBase::componentSelected( QListViewItem * ) +void WizardBase::componentSelected( TQListViewItem * ) { } diff --git a/src/chart.cpp b/src/chart.cpp index fd90368..60bc741 100644 --- a/src/chart.cpp +++ b/src/chart.cpp @@ -24,22 +24,22 @@ #include "chart.h" #include "functions.h" -#include <qpainter.h> -#include <qbrush.h> +#include <ntqpainter.h> +#include <ntqbrush.h> #include <kdebug.h> using namespace tk; -Chart::Chart(QWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed, const double* sys_uploadBuffer, const double* sys_downloadBuffer, int sys_bufferSize, const int* sys_ptr, const double* sys_maxspeed, bool gotEth0) : QWidget(parent), mUplBuffer(uploadBuffer), mDldBuffer(downloadBuffer), mBufferSize(bufferSize), mPtr(ptr), mMaxSpeed(maxspeed),sys_mUplBuffer(sys_uploadBuffer), sys_mDldBuffer(sys_downloadBuffer), sys_mBufferSize(sys_bufferSize), sys_mPtr(sys_ptr), sys_mMaxSpeed(sys_maxspeed),mGotEth0(gotEth0) { - setWFlags(Qt::WNoAutoErase); - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); +Chart::Chart(TQWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed, const double* sys_uploadBuffer, const double* sys_downloadBuffer, int sys_bufferSize, const int* sys_ptr, const double* sys_maxspeed, bool gotEth0) : TQWidget(parent), mUplBuffer(uploadBuffer), mDldBuffer(downloadBuffer), mBufferSize(bufferSize), mPtr(ptr), mMaxSpeed(maxspeed),sys_mUplBuffer(sys_uploadBuffer), sys_mDldBuffer(sys_downloadBuffer), sys_mBufferSize(sys_bufferSize), sys_mPtr(sys_ptr), sys_mMaxSpeed(sys_maxspeed),mGotEth0(gotEth0) { + setWFlags(TQt::WNoAutoErase); + setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } -void Chart::paintEvent(QPaintEvent*) { - QPainter paint(this); - paint.setBackgroundColor(Qt::black); - paint.setBackgroundMode(Qt::OpaqueMode); - QBrush brush(QColor(0x33, 0x33, 0x33), CrossPattern); +void Chart::paintEvent(TQPaintEvent*) { + TQPainter paint(this); + paint.setBackgroundColor(TQt::black); + paint.setBackgroundMode(TQt::OpaqueMode); + TQBrush brush(TQColor(0x33, 0x33, 0x33), CrossPattern); paint.fillRect(0, 0, width(), height(), brush); @@ -55,11 +55,11 @@ void Chart::paintEvent(QPaintEvent*) { i = mBufferSize-1; int rxY = HEIGHT - int(HEIGHT * (mDldBuffer[i]/(*mMaxSpeed))); int txY = HEIGHT - int(HEIGHT * (mUplBuffer[i]/(*mMaxSpeed))); - paint.setPen(Qt::green); + paint.setPen(TQt::green); paint.drawLine(lastX, lastRxY, x, rxY); - paint.setPen(Qt::red); + paint.setPen(TQt::red); paint.drawLine(lastX, lastTxY, x, txY); - //qDebug("%d => %d", i, int(mSpeedHistoryRx[i])); + //tqDebug("%d => %d", i, int(mSpeedHistoryRx[i])); lastX = x; lastRxY = rxY; lastTxY = txY; @@ -69,11 +69,11 @@ void Chart::paintEvent(QPaintEvent*) { } - paint.setFont(QFont("Helvetica", 8)); - paint.setPen( Qt::red ); - paint.drawText( rect(), Qt::AlignTop, QString("Tor Tx: %1 ").arg(BytesPerSecToString(mUplBuffer[*mPtr]))); - paint.setPen( Qt::green ); - paint.drawText( rect(), Qt::AlignBottom, QString("Tor Rx: %1 ").arg(BytesPerSecToString(mDldBuffer[*mPtr]))); + paint.setFont(TQFont("Helvetica", 8)); + paint.setPen( TQt::red ); + paint.drawText( rect(), TQt::AlignTop, TQString("Tor Tx: %1 ").arg(BytesPerSecToString(mUplBuffer[*mPtr]))); + paint.setPen( TQt::green ); + paint.drawText( rect(), TQt::AlignBottom, TQString("Tor Rx: %1 ").arg(BytesPerSecToString(mDldBuffer[*mPtr]))); if (mGotEth0){ lastX = x = width(); @@ -85,11 +85,11 @@ void Chart::paintEvent(QPaintEvent*) { i = sys_mBufferSize-1; int rxY = HEIGHT - int(HEIGHT * (sys_mDldBuffer[i]/(*sys_mMaxSpeed))); int txY = HEIGHT - int(HEIGHT * (sys_mUplBuffer[i]/(*sys_mMaxSpeed))); - paint.setPen(Qt::darkGreen); + paint.setPen(TQt::darkGreen); paint.drawLine(lastX, lastRxY, x, rxY); - paint.setPen(Qt::darkRed); + paint.setPen(TQt::darkRed); paint.drawLine(lastX, lastTxY, x, txY); - //qDebug("%d => %d", i, int(mSpeedHistoryRx[i])); + //tqDebug("%d => %d", i, int(mSpeedHistoryRx[i])); lastX = x; lastRxY = rxY; lastTxY = txY; @@ -99,22 +99,22 @@ void Chart::paintEvent(QPaintEvent*) { } - QString TorTX = QString("Tor Tx: %1 ").arg(BytesPerSecToString(mUplBuffer[*mPtr])); - QString SysTX = QString("Sys Tx: %1 ").arg(BytesPerSecToString(sys_mUplBuffer[*sys_mPtr])); - QString TorRX = QString("Tor Rx: %1 ").arg(BytesPerSecToString(mDldBuffer[*mPtr])); - QString SysRX = QString("Sys Rx: %1 ").arg(BytesPerSecToString(sys_mDldBuffer[*sys_mPtr])); + TQString TorTX = TQString("Tor Tx: %1 ").arg(BytesPerSecToString(mUplBuffer[*mPtr])); + TQString SysTX = TQString("Sys Tx: %1 ").arg(BytesPerSecToString(sys_mUplBuffer[*sys_mPtr])); + TQString TorRX = TQString("Tor Rx: %1 ").arg(BytesPerSecToString(mDldBuffer[*mPtr])); + TQString SysRX = TQString("Sys Rx: %1 ").arg(BytesPerSecToString(sys_mDldBuffer[*sys_mPtr])); //Paint Text Representation - QRect first = paint.boundingRect( rect(), Qt::AlignTop, TorTX); + TQRect first = paint.boundingRect( rect(), TQt::AlignTop, TorTX); first.moveLeft(first.width()); - first.setWidth(paint.boundingRect( rect(), Qt::AlignTop, SysTX).width()); - paint.setPen( Qt::red ); - paint.drawText( first, Qt::AlignTop, SysTX); + first.setWidth(paint.boundingRect( rect(), TQt::AlignTop, SysTX).width()); + paint.setPen( TQt::red ); + paint.drawText( first, TQt::AlignTop, SysTX); - first = paint.boundingRect( rect(), Qt::AlignBottom, TorRX); + first = paint.boundingRect( rect(), TQt::AlignBottom, TorRX); first.moveLeft(first.width()); - first.setWidth(paint.boundingRect( rect(), Qt::AlignTop, SysRX).width()); - paint.setPen( Qt::green ); - paint.drawText( first, Qt::AlignTop, SysRX); + first.setWidth(paint.boundingRect( rect(), TQt::AlignTop, SysRX).width()); + paint.setPen( TQt::green ); + paint.drawText( first, TQt::AlignTop, SysRX); } diff --git a/src/chart.h b/src/chart.h index 8757261..bf41378 100644 --- a/src/chart.h +++ b/src/chart.h @@ -23,16 +23,16 @@ #ifndef CHART_H #define CHART_H -#include <qwidget.h> +#include <ntqwidget.h> -class QPaintEvent; +class TQPaintEvent; -class Chart : public QWidget { +class Chart : public TQWidget { public: - Chart(QWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed, const double* sys_uploadBuffer, const double* sys_downloadBuffer, int sys_bufferSize, const int* sys_ptr, const double* sys_maxspeed, bool gotEth0); - QSize sizeHint() { return QSize(600, 25); } + Chart(TQWidget* parent, const double* uploadBuffer, const double* downloadBuffer, int bufferSize, const int* ptr, const double* maxspeed, const double* sys_uploadBuffer, const double* sys_downloadBuffer, int sys_bufferSize, const int* sys_ptr, const double* sys_maxspeed, bool gotEth0); + TQSize sizeHint() { return TQSize(600, 25); } protected: - void paintEvent( QPaintEvent* ev ); + void paintEvent( TQPaintEvent* ev ); private: const double* mUplBuffer; diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 55af9ab..341ab58 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -51,21 +51,21 @@ email : markey@web.de #include "crypto.h" #include "../config.h" -#include <qcombobox.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qmessagebox.h> -#include <qobjectlist.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qspinbox.h> -#include <qtextcodec.h> -#include <qtooltip.h> -#include <qvbox.h> -#include <qlistview.h> -#include <qcheckbox.h> +#include <ntqcombobox.h> +#include <ntqgroupbox.h> +#include <ntqlabel.h> +#include <ntqlayout.h> +#include <ntqlineedit.h> +#include <ntqmessagebox.h> +#include <ntqobjectlist.h> +#include <ntqpushbutton.h> +#include <ntqradiobutton.h> +#include <ntqspinbox.h> +#include <ntqtextcodec.h> +#include <ntqtooltip.h> +#include <ntqvbox.h> +#include <ntqlistview.h> +#include <ntqcheckbox.h> #include <kapplication.h> //kapp #include <kcombobox.h> @@ -82,7 +82,7 @@ email : markey@web.de // PUBLIC ////////////////////////////////////////////////////////////////////////////////////////// -TorkConfigDialog::TorkConfigDialog( QWidget *parent, const char* name, KConfigSkeleton *config ) +TorkConfigDialog::TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config ) : KConfigDialog( parent, name, config ),m_parent(parent) { setWFlags( WDestructiveClose ); @@ -132,15 +132,15 @@ TorkConfigDialog::TorkConfigDialog( QWidget *parent, const char* name, KConfigSk i18n( "Configure My Hidden Services" ) ); - QObjectList *list = queryList( "QLabel", "infoPixmap" ); - for( QObject *label = list->first(); label; label = list->next() ) - static_cast<QLabel*>(label)->setPixmap( QMessageBox::standardIcon( QMessageBox::Information ) ); + TQObjectList *list = queryList( "TQLabel", "infoPixmap" ); + for( TQObject *label = list->first(); label; label = list->next() ) + static_cast<TQLabel*>(label)->setPixmap( TQMessageBox::standardIcon( TQMessageBox::Information ) ); delete list; //stop KFont Requesters getting stupidly large - list = queryList( "QLabel", "m_sampleLabel" ); - for( QObject *label = list->first(); label; label = list->next() ) - static_cast<QLabel*>(label)->setMaximumWidth( 250 ); + list = queryList( "TQLabel", "m_sampleLabel" ); + for( TQObject *label = list->first(); label; label = list->next() ) + static_cast<TQLabel*>(label)->setMaximumWidth( 250 ); delete list; connect( m_usability->LongLivedPorts, SIGNAL( selectionChanged() ), this, SLOT( enableApply() ) ); @@ -225,7 +225,7 @@ void TorkConfigDialog::showServerOpts( bool state) /** Show page by object name */ -void TorkConfigDialog::showPage( const QCString& page ) +void TorkConfigDialog::showPage( const TQCString& page ) { for( uint index = 0; index < m_pageList.count(); index++ ) { if ( m_pageList[index]->name() == page ) { @@ -236,7 +236,7 @@ void TorkConfigDialog::showPage( const QCString& page ) } /** Reimplemented from KConfigDialog */ -void TorkConfigDialog::addPage( QWidget *page, const QString &itemName, const QString &pixmapName, const QString &header, bool manage ) +void TorkConfigDialog::addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, const TQString &header, bool manage ) { // Add the widget pointer to our list, for later reference m_pageList << page; @@ -258,7 +258,7 @@ void TorkConfigDialog::updateCustomSettings() //When settings are changed in the config dialog, this is called //to update all possibly changed values and apply them to Tor. - //QListViews need to be handled outside of kconfigxt + //TQListViews need to be handled outside of kconfigxt TorkConfig::setQuickConfigure( m_quickconfig->QuickConfigure->currentItem() ); TorkConfig::setAccountingStart(m_myserver->AccountingStart->currentText()); @@ -267,8 +267,8 @@ void TorkConfigDialog::updateCustomSettings() //Unverified Servers if ( m_torservers->AllowUnverifiedNodes->childCount() > 0 ) { - QStringList v_allowUnverifiedNodes; - QListViewItemIterator it( m_torservers->AllowUnverifiedNodes, QListViewItemIterator::Selected ); + TQStringList v_allowUnverifiedNodes; + TQListViewItemIterator it( m_torservers->AllowUnverifiedNodes, TQListViewItemIterator::Selected ); while ( it.current() ) { v_allowUnverifiedNodes.append(it.current()->text(0)); ++it; @@ -278,10 +278,10 @@ void TorkConfigDialog::updateCustomSettings() //Friendly Servers if ( m_torservers->MapAddress->childCount() > 0 ) { - QStringList v_mapAddress; - QListViewItemIterator it( m_torservers->MapAddress ); + TQStringList v_mapAddress; + TQListViewItemIterator it( m_torservers->MapAddress ); while ( it.current() ) { - QString s_mapAddress = it.current()->text(0) + " " + it.current()->text(0) + "." + + TQString s_mapAddress = it.current()->text(0) + " " + it.current()->text(0) + "." + it.current()->text(1) + "." + it.current()->text(2); v_mapAddress.append(s_mapAddress); ++it; @@ -291,7 +291,7 @@ void TorkConfigDialog::updateCustomSettings() TorkConfig::setMapAddress( "" ); //Exclude Countries - QStringList cclist; + TQStringList cclist; for (unsigned int index = 0; index != m_torservers->CountryList->count(); ++index){ cclist.append(m_torservers->ccode(m_torservers->CountryList->item(index)->text())); } @@ -306,9 +306,9 @@ void TorkConfigDialog::updateCustomSettings() //Enemy Servers if ( m_torservers->ExcludeNodes->childCount() > 0 ) { - QStringList v_excludeNodes; - QStringList v_excludeServersHistory; - QListViewItemIterator it( m_torservers->ExcludeNodes ); + TQStringList v_excludeNodes; + TQStringList v_excludeServersHistory; + TQListViewItemIterator it( m_torservers->ExcludeNodes ); while ( it.current() ) { v_excludeNodes.append("$"+getFPFromFPDigest(it.current()->text(2))); v_excludeServersHistory.append(it.current()->text(1) + "-" + @@ -318,15 +318,15 @@ void TorkConfigDialog::updateCustomSettings() TorkConfig::setExcludeNodes( v_excludeNodes ); TorkConfig::setExcludeServersHistory( v_excludeServersHistory ); }else{ - TorkConfig::setExcludeNodes( QStringList() ); - TorkConfig::setExcludeServersHistory( QStringList() ); + TorkConfig::setExcludeNodes( TQStringList() ); + TorkConfig::setExcludeServersHistory( TQStringList() ); } //Exit Servers if ( m_torservers->ExitNodes->childCount() > 0 ) { - QStringList v_exitNodes; - QStringList v_includeServersHistory; - QListViewItemIterator it( m_torservers->ExitNodes ); + TQStringList v_exitNodes; + TQStringList v_includeServersHistory; + TQListViewItemIterator it( m_torservers->ExitNodes ); while ( it.current() ) { v_exitNodes.append("$"+getFPFromFPDigest(it.current()->text(2))); v_includeServersHistory.append(it.current()->text(1) + "-" + @@ -337,14 +337,14 @@ void TorkConfigDialog::updateCustomSettings() TorkConfig::setExitNodes( v_exitNodes ); TorkConfig::setIncludeServersHistory( v_includeServersHistory ); }else{ - TorkConfig::setExitNodes( QStringList() ); - TorkConfig::setIncludeServersHistory( QStringList() ); + TorkConfig::setExitNodes( TQStringList() ); + TorkConfig::setIncludeServersHistory( TQStringList() ); } //Family Servers if ( m_myserver->MyFamily->childCount() > 0 ) { - QStringList v_myFamily; - QListViewItemIterator it( m_myserver->MyFamily, QListViewItemIterator::Selected ); + TQStringList v_myFamily; + TQListViewItemIterator it( m_myserver->MyFamily, TQListViewItemIterator::Selected ); while ( it.current() ) { v_myFamily.append(it.current()->text(1) + "-" + it.current()->text(2) + "-" + it.current()->text(3)); @@ -352,13 +352,13 @@ void TorkConfigDialog::updateCustomSettings() } TorkConfig::setMyFamily( v_myFamily ); }else{ - TorkConfig::setMyFamily( QStringList() ); + TorkConfig::setMyFamily( TQStringList() ); } //Track Host Exits if ( m_usability->TrackHostExits->childCount() > 0 ) { - QStringList v_trackHostExits; - QListViewItemIterator it( m_usability->TrackHostExits ); + TQStringList v_trackHostExits; + TQListViewItemIterator it( m_usability->TrackHostExits ); while ( it.current() ) { v_trackHostExits.append(it.current()->text(0)); ++it; @@ -369,8 +369,8 @@ void TorkConfigDialog::updateCustomSettings() //Long Lived Ports if ( m_usability->LongLivedPorts->childCount() > 0 ) { - QStringList v_longLivedPorts; - QListViewItemIterator it( m_usability->LongLivedPorts, QListViewItemIterator::Selected ); + TQStringList v_longLivedPorts; + TQListViewItemIterator it( m_usability->LongLivedPorts, TQListViewItemIterator::Selected ); while ( it.current() ) { int i; for (i = 0; _port_name[i].port; ++i) { @@ -387,10 +387,10 @@ void TorkConfigDialog::updateCustomSettings() //Socks Bind Addresses if ( m_running->SOCKSBindAddressMany->childCount() > 0 ) { - QStringList v_sOCKSBindAddressMany; - QListViewItemIterator it( m_running->SOCKSBindAddressMany ); + TQStringList v_sOCKSBindAddressMany; + TQListViewItemIterator it( m_running->SOCKSBindAddressMany ); while ( it.current() ) { - QString s_sOCKSBindAddressMany = it.current()->text(0) + ":" + it.current()->text(1); + TQString s_sOCKSBindAddressMany = it.current()->text(0) + ":" + it.current()->text(1); v_sOCKSBindAddressMany.append(s_sOCKSBindAddressMany); ++it; } @@ -400,10 +400,10 @@ void TorkConfigDialog::updateCustomSettings() //Exit Policy if ( m_myserver->ExitPolicy->childCount() > 0 ) { - QStringList v_exitPolicy; - QListViewItemIterator it( m_myserver->ExitPolicy ); + TQStringList v_exitPolicy; + TQListViewItemIterator it( m_myserver->ExitPolicy ); while ( it.current() ) { - QString s_exitPolicy = it.current()->text(0) + " " + it.current()->text(1) + ":" + it.current()->text(2); + TQString s_exitPolicy = it.current()->text(0) + " " + it.current()->text(1) + ":" + it.current()->text(2); v_exitPolicy.append(s_exitPolicy); ++it; } @@ -413,10 +413,10 @@ void TorkConfigDialog::updateCustomSettings() //Socks Policy if ( m_running->SOCKSPolicy->childCount() > 0 ) { - QStringList v_sOCKSPolicy; - QListViewItemIterator it( m_running->SOCKSPolicy ); + TQStringList v_sOCKSPolicy; + TQListViewItemIterator it( m_running->SOCKSPolicy ); while ( it.current() ) { - QString s_sOCKSPolicy = it.current()->text(0) + " " + it.current()->text(1) + ":" + it.current()->text(2); + TQString s_sOCKSPolicy = it.current()->text(0) + " " + it.current()->text(1) + ":" + it.current()->text(2); v_sOCKSPolicy.append(s_sOCKSPolicy); ++it; } @@ -426,10 +426,10 @@ void TorkConfigDialog::updateCustomSettings() //Filter Rules if ( m_filtertable->FilterRules->childCount() > 0 ) { - QStringList v_filterRules; - QListViewItemIterator it( m_filtertable->FilterRules ); + TQStringList v_filterRules; + TQListViewItemIterator it( m_filtertable->FilterRules ); while ( it.current() ) { - QString s_filterRules = it.current()->text(0) + "%:%" + it.current()->text(1)+ "%:%" + it.current()->text(2); + TQString s_filterRules = it.current()->text(0) + "%:%" + it.current()->text(1)+ "%:%" + it.current()->text(2); v_filterRules.append(s_filterRules); ++it; } @@ -439,10 +439,10 @@ void TorkConfigDialog::updateCustomSettings() //Reachable Address if ( m_firewallsproxies->ReachableAddresses->childCount() > 0 ) { - QStringList v_reachableAddresses; - QListViewItemIterator it( m_firewallsproxies->ReachableAddresses ); + TQStringList v_reachableAddresses; + TQListViewItemIterator it( m_firewallsproxies->ReachableAddresses ); while ( it.current() ) { - QString s_reachableAddresses = "*:" + it.current()->text(0); + TQString s_reachableAddresses = "*:" + it.current()->text(0); v_reachableAddresses.append(s_reachableAddresses); ++it; } @@ -452,24 +452,24 @@ void TorkConfigDialog::updateCustomSettings() //Bridge Addresses if ( m_firewallsproxies->Bridge->childCount() > 0 ) { - QStringList v_bridges; - QListViewItemIterator it( m_firewallsproxies->Bridge ); + TQStringList v_bridges; + TQListViewItemIterator it( m_firewallsproxies->Bridge ); while ( it.current() ) { - QString s_bridges = it.current()->text(0) + ":" + it.current()->text(1) + TQString s_bridges = it.current()->text(0) + ":" + it.current()->text(1) + " " + it.current()->text(2); v_bridges.append(s_bridges); ++it; } TorkConfig::setBridge( v_bridges ); }else - TorkConfig::setBridge( QStringList() ); + TorkConfig::setBridge( TQStringList() ); //Hidden Services // if ( m_myhidden->servicesList->childCount() > 0 ) { -// QStringList v_hiddenServices; -// QListViewItemIterator it( m_myhidden->servicesList ); +// TQStringList v_hiddenServices; +// TQListViewItemIterator it( m_myhidden->servicesList ); // while ( it.current() ) { -// QString s_hiddenServices = it.current()->text(0) + "\n" + it.current()->text(1) +// TQString s_hiddenServices = it.current()->text(0) + "\n" + it.current()->text(1) // + "\n" + it.current()->text(2) + "\n" + it.current()->text(3) // + "\n" + it.current()->text(4)+ "\n" + it.current()->text(5); // v_hiddenServices.append(s_hiddenServices); @@ -481,10 +481,10 @@ void TorkConfigDialog::updateCustomSettings() //Bandwidth Slots if ( m_maxmin->timedBandwidthList->childCount() > 0 ) { - QStringList v_bandwidthSlots; - QListViewItemIterator it( m_maxmin->timedBandwidthList ); + TQStringList v_bandwidthSlots; + TQListViewItemIterator it( m_maxmin->timedBandwidthList ); while ( it.current() ) { - QString s_bandwidthSlots = it.current()->text(0) + "\n" + it.current()->text(1) + TQString s_bandwidthSlots = it.current()->text(0) + "\n" + it.current()->text(1) + "\n" + it.current()->text(2) + "\n" + it.current()->text(3) + "\n" + it.current()->text(4); v_bandwidthSlots.append(s_bandwidthSlots); diff --git a/src/configdialog.h b/src/configdialog.h index 7bb145e..45d4824 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -19,26 +19,26 @@ email : markey@web.de #define TORKCONFIGDIALOG_H -#include <qmap.h> -#include <qvaluelist.h> +#include <ntqmap.h> +#include <ntqvaluelist.h> #include <kconfigdialog.h> -class QComboBox; -class QGroupBox; -class QVBox; +class TQComboBox; +class TQGroupBox; +class TQVBox; class TorkConfigDialog : public KConfigDialog { Q_OBJECT public: - TorkConfigDialog( QWidget *parent, const char* name, KConfigSkeleton *config ); + TorkConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config ); ~TorkConfigDialog(); - void addPage( QWidget *page, const QString &itemName, const QString &pixmapName, - const QString &header=QString::null, bool manage=true); + void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName, + const TQString &header=TQString::null, bool manage=true); - void showPage( const QCString& page ); + void showPage( const TQCString& page ); class QuickConfig *m_quickconfig; public slots: void showServerOpts(bool state); @@ -59,11 +59,11 @@ class TorkConfigDialog : public KConfigDialog class MyHidden *m_myhidden; class Konq *m_konq; - QValueList<QWidget*> m_pageList; - QMap<QString, QString> m_pluginName; - QMap<QString, QString> m_pluginTorkName; + TQValueList<TQWidget*> m_pageList; + TQMap<TQString, TQString> m_pluginName; + TQMap<TQString, TQString> m_pluginTorkName; - QWidget* m_parent; + TQWidget* m_parent; }; diff --git a/src/crashhandler.cpp b/src/crashhandler.cpp index 5e072e6..7505f6a 100644 --- a/src/crashhandler.cpp +++ b/src/crashhandler.cpp @@ -20,10 +20,10 @@ #include <klocale.h> #include <ktempfile.h> -#include <qfile.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qglobal.h> //qVersion() +#include <ntqfile.h> +#include <ntqregexp.h> +#include <ntqtextstream.h> +#include <ntqglobal.h> //tqVersion() #include <cstdio> //popen, fread #include <iostream> @@ -44,8 +44,8 @@ namespace torK }; #endif - static QString - runCommand( const QCString &command ) + static TQString + runCommand( const TQCString &command ) { static const uint SIZE = 40960; //40 KiB static char stdoutBuf[ SIZE ] = {0}; @@ -58,7 +58,7 @@ namespace torK stdoutBuf[ std::fread( static_cast<void*>( stdoutBuf ), sizeof(char), SIZE-1, process ) ] = '\0'; ::pclose( process ); } - return QString::fromLocal8Bit( stdoutBuf ); + return TQString::fromLocal8Bit( stdoutBuf ); } void @@ -79,8 +79,8 @@ namespace torK // we are the child process (the result of the fork) std::cout << "TorK is crashing...\n"; - QString subject = TORK_VERSION " "; - QString body = i18n( + TQString subject = TORK_VERSION " "; + TQString body = i18n( "TorK has crashed! We are terribly sorry about this :(\n\n" "But, all is not lost! You could potentially help us fix the crash. " "Information describing the crash is below, so just click send, " @@ -96,14 +96,14 @@ namespace torK "Build date: " __DATE__ "\n" "CC version: " __VERSION__ "\n" //assuming we're using GCC "KDElibs: " KDE_VERSION_STRING "\n" - "Qt: %2\n" + "TQt: %2\n" "CPU count: %6\n"; - QString cpucount = "unknown"; + TQString cpucount = "unknown"; #ifdef __linux__ - QString line; + TQString line; uint cpuCount = 0; - QFile cpuinfo( "/proc/cpuinfo" ); + TQFile cpuinfo( "/proc/cpuinfo" ); if ( cpuinfo.open( IO_ReadOnly ) ) { while ( cpuinfo.readLine( line, 20000 ) != -1 ) { if ( line.startsWith( "processor" ) ) { @@ -111,11 +111,11 @@ namespace torK } } } - cpucount = QString::number( cpuCount ); + cpucount = TQString::number( cpuCount ); #endif - body = body.arg( qVersion() ) + body = body.arg( tqVersion() ) .arg( cpucount ); #ifdef NDEBUG @@ -130,13 +130,13 @@ namespace torK const int handle = temp.handle(); -// QCString gdb_command_string = +// TQCString gdb_command_string = // "file tork\n" -// "attach " + QCString().setNum( ::getppid() ) + "\n" +// "attach " + TQCString().setNum( ::getppid() ) + "\n" // "bt\n" "echo \\n\n" // "thread apply all bt\n"; - const QCString gdb_batch = + const TQCString gdb_batch = "bt\n" "echo \\n\\n\n" "bt full\n" @@ -151,23 +151,23 @@ namespace torK ::dup2( fileno( stdout ), fileno( stderr ) ); - QCString gdb; + TQCString gdb; gdb = "gdb --nw -n --batch -x "; gdb += temp.name().latin1(); gdb += " tork "; - gdb += QCString().setNum( ::getppid() ); + gdb += TQCString().setNum( ::getppid() ); - QString bt = runCommand( gdb ); + TQString bt = runCommand( gdb ); /// clean up bt.remove( "(no debugging symbols found)..." ); bt.remove( "(no debugging symbols found)\n" ); - bt.replace( QRegExp("\n{2,}"), "\n" ); //clean up multiple \n characters + bt.replace( TQRegExp("\n{2,}"), "\n" ); //clean up multiple \n characters bt.stripWhiteSpace(); /// analyze usefulness bool useful = true; - const QString fileCommandOutput = runCommand( "file `which tork`" ); + const TQString fileCommandOutput = runCommand( "file `which tork`" ); if( fileCommandOutput.find( "not stripped", false ) == -1 ) subject += "[___stripped]"; //same length as below @@ -175,18 +175,18 @@ namespace torK subject += "[NOTstripped]"; if( !bt.isEmpty() ) { - const int invalidFrames = bt.contains( QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in \\?\\?") ); - const int validFrames = bt.contains( QRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in [^?]") ); + const int invalidFrames = bt.contains( TQRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in \\?\\?") ); + const int validFrames = bt.contains( TQRegExp("\n#[0-9]+\\s+0x[0-9A-Fa-f]+ in [^?]") ); const int totalFrames = invalidFrames + validFrames; if( totalFrames > 0 ) { const double validity = double(validFrames) / totalFrames; - subject += QString("[validity: %1]").arg( validity, 0, 'f', 2 ); + subject += TQString("[validity: %1]").arg( validity, 0, 'f', 2 ); if( validity <= 0.5 ) useful = false; } - subject += QString("[frames: %1]").arg( totalFrames, 3 /*padding*/ ); + subject += TQString("[frames: %1]").arg( totalFrames, 3 /*padding*/ ); - if( bt.find( QRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 ) + if( bt.find( TQRegExp(" at \\w*\\.cpp:\\d+\n") ) >= 0 ) subject += "[line numbers]"; } else @@ -211,12 +211,12 @@ namespace torK //TODO startup notification kapp->invokeMailer( /*to*/ "tork-backtraces@lists.sf.net", - /*cc*/ QString(), - /*bcc*/ QString(), + /*cc*/ TQString(), + /*bcc*/ TQString(), /*subject*/ subject, /*body*/ body, - /*messageFile*/ QString(), - /*attachURLs*/ QStringList(), + /*messageFile*/ TQString(), + /*attachURLs*/ TQStringList(), /*startup_id*/ "" ); } else { @@ -245,9 +245,9 @@ namespace torK #if 0 -#include <qlabel.h> -#include <qlayout.h> -#include <qvbox.h> +#include <ntqlabel.h> +#include <ntqlayout.h> +#include <ntqvbox.h> #include <kdialog.h> #include <kpushbutton.h> #include <kstdguiitem.h> @@ -255,20 +255,20 @@ namespace torK torK::CrashHandlerWidget::CrashHandlerWidget() { - QBoxLayout *layout = new QHBoxLayout( this, 18, 12 ); + TQBoxLayout *layout = new TQHBoxLayout( this, 18, 12 ); { - QBoxLayout *lay = new QVBoxLayout( layout ); - QLabel *label = new QLabel( this ); + TQBoxLayout *lay = new TQVBoxLayout( layout ); + TQLabel *label = new TQLabel( this ); label->setPixmap( locate( "data", "drkonqi/pics/konqi.png" ) ); - label->setFrameStyle( QFrame::Plain | QFrame::Box ); + label->setFrameStyle( TQFrame::Plain | TQFrame::Box ); lay->add( label ); - lay->addItem( new QSpacerItem( 3, 3, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); + lay->addItem( new TQSpacerItem( 3, 3, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); } - layout = new QVBoxLayout( layout, 6 ); + layout = new TQVBoxLayout( layout, 6 ); - layout->add( new QLabel( /*i18n*/( + layout->add( new TQLabel( /*i18n*/( "<p>" "TorK has crashed! We are terribly sorry about this :(" "<p>" "However you now have an opportunity to help us fix this crash so that it doesn't " "happen again! Click <b>Send Email</b> and TorK will prepare an email that you " @@ -276,13 +276,13 @@ torK::CrashHandlerWidget::CrashHandlerWidget() "as soon as possible." "<p>" "Thanks for choosing TorK.<br>" ), this ) ); - layout = new QHBoxLayout( layout, 6 ); + layout = new TQHBoxLayout( layout, 6 ); - layout->addItem( new QSpacerItem( 6, 6, QSizePolicy::Expanding ) ); + layout->addItem( new TQSpacerItem( 6, 6, TQSizePolicy::Expanding ) ); layout->add( new KPushButton( KGuiItem( i18n("Send Email"), "mail_send" ), this, "email" ) ); layout->add( new KPushButton( KStdGuiItem::close(), this, "close" ) ); - static_cast<QPushButton*>(child("email"))->setDefault( true ); + static_cast<TQPushButton*>(child("email"))->setDefault( true ); connect( child( "email" ), SIGNAL(clicked()), SLOT(accept()) ); connect( child( "close" ), SIGNAL(clicked()), SLOT(reject()) ); diff --git a/src/crypto.cpp b/src/crypto.cpp index a47e19d..cd38be1 100644 --- a/src/crypto.cpp +++ b/src/crypto.cpp @@ -79,7 +79,7 @@ #define ADD_ENTROPY 32 -typedef QMap<QString, QString> servermap; +typedef TQMap<TQString, TQString> servermap; servermap serverTofp_identity; servermap fp_identityToServer; @@ -99,19 +99,19 @@ void clearServers() fp_identityToServer.clear(); } -QString fp_identity(const QString &server) +TQString fp_identity(const TQString &server) { return serverTofp_identity[server]; } -QString server(const QString &fp_identity) +TQString server(const TQString &fp_identity) { return fp_identityToServer[fp_identity]; } -void storeServer(const QString &server,const QString &fp_identity) +void storeServer(const TQString &server,const TQString &fp_identity) { serverTofp_identity[server] = fp_identity; @@ -121,11 +121,11 @@ void storeServer(const QString &server,const QString &fp_identity) -QString getFPDigestFromFP(const QString &fp) +TQString getFPDigestFromFP(const TQString &fp) { char identity64[BASE64_DIGEST_LEN+1]; char digest[DIGEST_LEN]; - QString FP = fp; + TQString FP = fp; FP.replace("$",""); base16_decode(digest, DIGEST_LEN, FP, strlen(FP)); @@ -133,38 +133,38 @@ QString getFPDigestFromFP(const QString &fp) return identity64; } -QString getNickNameFromFPDigest(const QString &fpdigest) +TQString getNickNameFromFPDigest(const TQString &fpdigest) { return fp_identityToServer[fpdigest]; } -QString getNickNameFromFP(const QString &fp) +TQString getNickNameFromFP(const TQString &fp) { - QString fpdigest = getFPDigestFromFP(fp); + TQString fpdigest = getFPDigestFromFP(fp); return fp_identityToServer[fpdigest]; } -QString getFPFromNickName(const QString &nickname) +TQString getFPFromNickName(const TQString &nickname) { char buf[256]; char hexdigest[HEX_DIGEST_LEN+1]; - QString fp = serverTofp_identity[nickname]; + TQString fp = serverTofp_identity[nickname]; if (fp.isEmpty()) - return QString(); + return TQString(); if (!digest_from_base64(buf, fp)) base16_encode(hexdigest, HEX_DIGEST_LEN+1, buf, DIGEST_LEN); return hexdigest; } -QString getFPFromFPDigest(const QString &fp) +TQString getFPFromFPDigest(const TQString &fp) { char buf[256]; char hexdigest[HEX_DIGEST_LEN+1]; @@ -254,14 +254,14 @@ crypto_rand_int(unsigned int max) /** Generates a pseudorandom string of length <b>len</b> containing printable * ASCII characters from the range '!' (0x21) to '~' (0x7e). */ -QString +TQString crypto_rand_string(int len) { - QString str; + TQString str; Q_ASSERT(len >= 0); for (int i = 0; i < len; i++) - str += QChar('!' + crypto_rand_int('~'-'!'+1)); + str += TQChar('!' + crypto_rand_int('~'-'!'+1)); return str; } @@ -605,7 +605,7 @@ secret_to_key(char *key_out, size_t key_out_len, const char *secret, /** Entry point for password hashing: take the desired password from * the command line, and print its salted hash to stdout. **/ -QString hashPassword(const char* secret) +TQString hashPassword(const char* secret) { char output[256]; diff --git a/src/crypto.h b/src/crypto.h index 92c6094..6efa086 100644 --- a/src/crypto.h +++ b/src/crypto.h @@ -91,8 +91,8 @@ #define S2K_SPECIFIER_LEN 9 -#include <qmap.h> -#include <qstring.h> +#include <ntqmap.h> +#include <ntqstring.h> typedef struct crypto_digest_env_t crypto_digest_env_t; @@ -105,18 +105,18 @@ int digest_to_base64(char *d64, const char *digest); int base64_encode(char *dest, size_t destlen, const char *src, size_t srclen); int base16_decode(char *dest, size_t destlen, const char *src, size_t srclen); -QString getFPDigestFromFP(const QString &fp); -QString getNickNameFromFPDigest(const QString &fpdigest); -QString getNickNameFromFP(const QString &fp); -QString getFPFromNickName(const QString &nickname); -QString getFPFromFPDigest(const QString &fp); -void storeServer(const QString &server,const QString &fp_identity); +TQString getFPDigestFromFP(const TQString &fp); +TQString getNickNameFromFPDigest(const TQString &fpdigest); +TQString getNickNameFromFP(const TQString &fp); +TQString getFPFromNickName(const TQString &nickname); +TQString getFPFromFPDigest(const TQString &fp); +void storeServer(const TQString &server,const TQString &fp_identity); void clearServers(); -QString fp_identity(const QString &server); -QString server(const QString &fp_identity); -QString hashPassword(const char* secret); +TQString fp_identity(const TQString &server); +TQString server(const TQString &fp_identity); +TQString hashPassword(const char* secret); -QString crypto_rand_string(int len); +TQString crypto_rand_string(int len); /* random numbers */ int crypto_seed_rng(void); diff --git a/src/dcoptork.h b/src/dcoptork.h index 4f4c6d6..d83c055 100644 --- a/src/dcoptork.h +++ b/src/dcoptork.h @@ -35,8 +35,8 @@ class DCOPTork : virtual public DCOPObject virtual bool getKDESetting() = 0; virtual void anonymousEmail() = 0; virtual void anonymousFirefox() = 0; - virtual void anonymizedFirefox(const QString & url) = 0; - virtual void anonymizedOpera(const QString & url) = 0; + virtual void anonymizedFirefox(const TQString & url) = 0; + virtual void anonymizedOpera(const TQString & url) = 0; virtual void anonymousOpera() = 0; virtual void anonymousKonversation() = 0; virtual void anonymousGaim() = 0; diff --git a/src/dndlistview.cpp b/src/dndlistview.cpp index 5ddfaf7..a218c9e 100644 --- a/src/dndlistview.cpp +++ b/src/dndlistview.cpp @@ -21,23 +21,23 @@ #include "dndlistview.h" #include "torkconfig.h" #include "kdebug.h" -#include <qapplication.h> -#include <qheader.h> +#include <ntqapplication.h> +#include <ntqheader.h> #include <kiconloader.h> #include <klocale.h> #include <kstandarddirs.h> -#include <qsimplerichtext.h> -#include <qpainter.h> +#include <ntqsimplerichtext.h> +#include <ntqpainter.h> -DndListView::DndListView( QWidget * parent, const char * name, WFlags f ) : - QListView( parent, name, f ), oldCurrent( 0 ), +DndListView::DndListView( TQWidget * parent, const char * name, WFlags f ) : + TQListView( parent, name, f ), oldCurrent( 0 ), dropItem( 0 ), mousePressed( FALSE ),m_recentDrop( FALSE) { setAllColumnsShowFocus( TRUE ); - //setResizeMode( QListView::AllColumns ); - setSelectionMode( QListView::Extended ); + //setResizeMode( TQListView::AllColumns ); + setSelectionMode( TQListView::Extended ); setAcceptDrops( TRUE ); viewport()->setAcceptDrops( TRUE ); @@ -48,19 +48,19 @@ DndListView::DndListView( QWidget * parent, const char * name, WFlags f ) : //static const int autoopenTime = 750; -void DndListView::contentsDragEnterEvent( QDragEnterEvent *e ) +void DndListView::contentsDragEnterEvent( TQDragEnterEvent *e ) { - setSelectionMode( QListView::Single ); + setSelectionMode( TQListView::Single ); - if ( !QTextDrag::canDecode( e ) ) { + if ( !TQTextDrag::canDecode( e ) ) { e->ignore(); return; } oldCurrent = currentItem(); - QListViewItem *i = itemAt( contentsToViewport(e->pos()) ); + TQListViewItem *i = itemAt( contentsToViewport(e->pos()) ); if ( i ) { dropItem = i; /* autoopen_timer->start( autoopenTime );*/ @@ -68,19 +68,19 @@ void DndListView::contentsDragEnterEvent( QDragEnterEvent *e ) } -void DndListView::contentsDragMoveEvent( QDragMoveEvent *e ) +void DndListView::contentsDragMoveEvent( TQDragMoveEvent *e ) { - if ( !QTextDrag::canDecode( e ) ) { + if ( !TQTextDrag::canDecode( e ) ) { e->ignore(); return; } - QPoint vp = contentsToViewport( ( (QDragMoveEvent*)e )->pos() ); - QListViewItem *i = itemAt( vp ); + TQPoint vp = contentsToViewport( ( (TQDragMoveEvent*)e )->pos() ); + TQListViewItem *i = itemAt( vp ); //!(e->source() == this) && - if ((QString(this->name()).contains("circuitList")) && - (QString(e->source()->name()).contains("serverList"))) { + if ((TQString(this->name()).contains("circuitList")) && + (TQString(e->source()->name()).contains("serverList"))) { if ( i ){ setSelected( i, TRUE ); @@ -89,8 +89,8 @@ void DndListView::contentsDragMoveEvent( QDragMoveEvent *e ) } } e->accept(); - }else if ((QString(this->name()).contains("circuitList")) && - (QString(e->source()->name()).contains("circuitList"))) { + }else if ((TQString(this->name()).contains("circuitList")) && + (TQString(e->source()->name()).contains("circuitList"))) { if ( i ){ setSelected( i, TRUE ); if ( i != dropItem ) { @@ -98,8 +98,8 @@ void DndListView::contentsDragMoveEvent( QDragMoveEvent *e ) } } e->accept(); - }else if ((QString(this->name()).contains("circuitList")) && - (QString(e->source()->name()).contains("ORList"))) { + }else if ((TQString(this->name()).contains("circuitList")) && + (TQString(e->source()->name()).contains("ORList"))) { if ( i ){ setSelected( i, TRUE ); if ( i != dropItem ) { @@ -107,8 +107,8 @@ void DndListView::contentsDragMoveEvent( QDragMoveEvent *e ) } } e->accept(); - }else if ((QString(this->name()).contains("circuitList")) && - (QString(e->source()->name()).contains("streamList"))) { + }else if ((TQString(this->name()).contains("circuitList")) && + (TQString(e->source()->name()).contains("streamList"))) { if ( i ){ setSelected( i, TRUE ); if ( i != dropItem ) { @@ -123,7 +123,7 @@ void DndListView::contentsDragMoveEvent( QDragMoveEvent *e ) } } -void DndListView::contentsDragLeaveEvent( QDragLeaveEvent * ) +void DndListView::contentsDragLeaveEvent( TQDragLeaveEvent * ) { /* autoopen_timer->stop();*/ @@ -132,42 +132,42 @@ void DndListView::contentsDragLeaveEvent( QDragLeaveEvent * ) setCurrentItem( oldCurrent ); setSelected( oldCurrent, TRUE ); - setSelectionMode( QListView::Extended ); + setSelectionMode( TQListView::Extended ); } -void DndListView::contentsDropEvent( QDropEvent *e ) +void DndListView::contentsDropEvent( TQDropEvent *e ) { // autoopen_timer->stop(); m_recentDrop = true; dropTimer = startTimer( 3000 ); - setSelectionMode( QListView::Extended ); + setSelectionMode( TQListView::Extended ); - QString text; - if ( !QTextDrag::decode( e, text ) ) { + TQString text; + if ( !TQTextDrag::decode( e, text ) ) { e->ignore(); return; } m_mousepos = e->pos() ; - QListViewItem *item = itemAt( contentsToViewport(e->pos()) ); - if (QString(this->name()).contains("circuitList")){ + TQListViewItem *item = itemAt( contentsToViewport(e->pos()) ); + if (TQString(this->name()).contains("circuitList")){ e->accept(); if ( item ) { - if (QString(e->source()->name()).contains("serverList")) + if (TQString(e->source()->name()).contains("serverList")) emit extendCircuit(item->text(0),text,true); - else if (QString(e->source()->name()).contains("circuitList")) + else if (TQString(e->source()->name()).contains("circuitList")) emit extendCircuit(item->text(0),text, true); - else if (QString(e->source()->name()).contains("ORList")) + else if (TQString(e->source()->name()).contains("ORList")) emit extendCircuit(item->text(0),text, false); - else if (QString(e->source()->name()).contains("streamList")) + else if (TQString(e->source()->name()).contains("streamList")) emit attach(item->text(0),text); } else{ - if (QString(e->source()->name()).contains("serverList")) + if (TQString(e->source()->name()).contains("serverList")) emit createCircuit(text,true); - else if (QString(e->source()->name()).contains("ORList")) + else if (TQString(e->source()->name()).contains("ORList")) emit createCircuit(text,false); } }else @@ -177,10 +177,10 @@ void DndListView::contentsDropEvent( QDropEvent *e ) -void DndListView::contentsMousePressEvent( QMouseEvent* e ) +void DndListView::contentsMousePressEvent( TQMouseEvent* e ) { - QPoint p( contentsToViewport( e->pos() ) ); - //QListViewItem *i = itemAt( p ); + TQPoint p( contentsToViewport( e->pos() ) ); + //TQListViewItem *i = itemAt( p ); /* if ( i ) { // if the user clicked into the root decoration of the item, don't try to start a drag! if ( p.x() > header()->cellPos( header()->mapToActual( 0 ) ) + @@ -191,33 +191,33 @@ void DndListView::contentsMousePressEvent( QMouseEvent* e ) } }*/ - if (e->button() == Qt::LeftButton){ + if (e->button() == TQt::LeftButton){ presspos = e->pos(); mousePressed = TRUE; } - QListView::contentsMousePressEvent( e ); + TQListView::contentsMousePressEvent( e ); } -void DndListView::contentsMouseMoveEvent( QMouseEvent* e ) +void DndListView::contentsMouseMoveEvent( TQMouseEvent* e ) { if ( mousePressed ) { kdDebug() << "in mouse move drag" << endl; mousePressed = FALSE; - //QListViewItem *item = itemAt( contentsToViewport(presspos) ); + //TQListViewItem *item = itemAt( contentsToViewport(presspos) ); int column; - if (QString(this->name()).contains("circuitList")) + if (TQString(this->name()).contains("circuitList")) column = 2; - else if (QString(this->name()).contains("ORList")) + else if (TQString(this->name()).contains("ORList")) column = 1; - else if (QString(this->name()).contains("streamList")) + else if (TQString(this->name()).contains("streamList")) column = 0; else column = 2; - QString selectedItems; - QListViewItemIterator it(this, QListViewItemIterator::Selected); + TQString selectedItems; + TQListViewItemIterator it(this, TQListViewItemIterator::Selected); while ( it.current() ) { if (this->isSelected( it.current())) selectedItems.append(it.current()->text(column)+" "); @@ -225,36 +225,36 @@ void DndListView::contentsMouseMoveEvent( QMouseEvent* e ) } if (!selectedItems.isEmpty()){ selectedItems = selectedItems.stripWhiteSpace(); - QDragObject *d = new QTextDrag( selectedItems, this ); + TQDragObject *d = new TQTextDrag( selectedItems, this ); d->dragCopy(); // do NOT delete d. } }else - QListView::contentsMouseMoveEvent( e ); + TQListView::contentsMouseMoveEvent( e ); } -void DndListView::contentsMouseReleaseEvent( QMouseEvent* e) +void DndListView::contentsMouseReleaseEvent( TQMouseEvent* e) { /* kdDebug() << "mouse released" << endl;*/ mousePressed = FALSE; - QListView::contentsMouseReleaseEvent(e); + TQListView::contentsMouseReleaseEvent(e); } -void DndListView::mouseReleaseEvent( QMouseEvent* e) +void DndListView::mouseReleaseEvent( TQMouseEvent* e) { /* kdDebug() << "mouse released" << endl;*/ mousePressed = FALSE; - QListView::mouseReleaseEvent(e); + TQListView::mouseReleaseEvent(e); } -QPoint DndListView::getMousePos() +TQPoint DndListView::getMousePos() { return m_mousepos; } -void DndListView::timerEvent( QTimerEvent * ) +void DndListView::timerEvent( TQTimerEvent * ) { //if ( e->timerId() == dropTimer ) // stop showing date m_recentDrop = false; @@ -265,20 +265,20 @@ void DndListView::timerEvent( QTimerEvent * ) void -DndListView::viewportPaintEvent( QPaintEvent *e ) +DndListView::viewportPaintEvent( TQPaintEvent *e ) { - QListView::viewportPaintEvent( e ); + TQListView::viewportPaintEvent( e ); if (!TorkConfig::displayBubble()) return; // Superimpose bubble help // Taken from mediabrowser.cpp in Amarok - if (( childCount() == 0 ) && (QString(this->name()).contains("streamList"))) + if (( childCount() == 0 ) && (TQString(this->name()).contains("streamList"))) { - QPainter p( viewport() ); + TQPainter p( viewport() ); - QSimpleRichText t( i18n( + TQSimpleRichText t( i18n( "<div align=center>" "<h4>Almost Everything Is Clickable.</h4>" "You can drag servers to create circuits. You can drag connections onto circuits " @@ -286,7 +286,7 @@ DndListView::viewportPaintEvent( QPaintEvent *e ) "You can right-click on servers to include/exclude them or their country from your " "connections. Remember though: <b> messing with stuff is fun, but generally bad for " "anonymity.</b>" - "</div>" ), QApplication::font() ); + "</div>" ), TQApplication::font() ); t.setWidth( width() - 50 ); @@ -295,49 +295,49 @@ DndListView::viewportPaintEvent( QPaintEvent *e ) p.setBrush( colorGroup().background() ); p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h ); - t.draw( &p, 20, 20, QRect(), colorGroup() ); + t.draw( &p, 20, 20, TQRect(), colorGroup() ); } } -// QDragObject *DndListView::dragObject() +// TQDragObject *DndListView::dragObject() // { // kdDebug() << "dragging item" << endl; -// return new QTextDrag( currentItem()->text(0), this ); +// return new TQTextDrag( currentItem()->text(0), this ); // } -// void DndListView::dragEnterEvent( QDragEnterEvent *evt ) +// void DndListView::dragEnterEvent( TQDragEnterEvent *evt ) // { // kdDebug() << "drag enter event" << endl; -// if ( QTextDrag::canDecode( evt ) ) +// if ( TQTextDrag::canDecode( evt ) ) // evt->accept(); // } // // -// void DndListView::dropEvent( QDropEvent *evt ) +// void DndListView::dropEvent( TQDropEvent *evt ) // { -// QString text; +// TQString text; // -// if ( QTextDrag::decode( evt, text ) ) +// if ( TQTextDrag::decode( evt, text ) ) // kdDebug() << text << endl; // } // // -// void DndListView::contentsMousePressEvent( QMouseEvent *evt ) +// void DndListView::contentsMousePressEvent( TQMouseEvent *evt ) // { // dragging = TRUE; // kdDebug() << "draggng mouse" << endl; -// QListView::mousePressEvent( evt ); +// TQListView::mousePressEvent( evt ); // // } // // -// void DndListView::contentsMouseMoveEvent( QMouseEvent * ) +// void DndListView::contentsMouseMoveEvent( TQMouseEvent * ) // { // if ( dragging ) { // kdDebug() << "dragging" << endl; -// QDragObject *d = new QTextDrag( currentItem()->text(0), this ); +// TQDragObject *d = new TQTextDrag( currentItem()->text(0), this ); // d->dragCopy(); // do NOT delete d. // dragging = FALSE; // } diff --git a/src/dndlistview.h b/src/dndlistview.h index 5e7c441..06a92de 100644 --- a/src/dndlistview.h +++ b/src/dndlistview.h @@ -22,60 +22,60 @@ #ifndef _DNDLISTVIEW_H_ #define _DNDLISTVIEW_H_ -#include <qlistview.h> -#include <qdragobject.h> +#include <ntqlistview.h> +#include <ntqdragobject.h> -class QDragEnterEvent; -class QDragDropEvent; +class TQDragEnterEvent; +class TQDragDropEvent; -class DndListView : public QListView +class DndListView : public TQListView { Q_OBJECT public: - DndListView( QWidget * parent = 0, const char * name = 0, WFlags f = 0 ); - QPoint m_mousepos; - QPoint getMousePos(); + DndListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + TQPoint m_mousepos; + TQPoint getMousePos(); bool recentDropEvent() { return m_recentDrop; }; - void contentsMouseReleaseEvent( QMouseEvent *e ); + void contentsMouseReleaseEvent( TQMouseEvent *e ); protected: - void contentsDragEnterEvent( QDragEnterEvent *e ); - void contentsDragMoveEvent( QDragMoveEvent *e ); - void contentsDragLeaveEvent( QDragLeaveEvent *e ); - void contentsDropEvent( QDropEvent *e ); - void contentsMouseMoveEvent( QMouseEvent *e ); - void contentsMousePressEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); - void timerEvent( QTimerEvent * ); - void viewportPaintEvent( QPaintEvent *e ); + void contentsDragEnterEvent( TQDragEnterEvent *e ); + void contentsDragMoveEvent( TQDragMoveEvent *e ); + void contentsDragLeaveEvent( TQDragLeaveEvent *e ); + void contentsDropEvent( TQDropEvent *e ); + void contentsMouseMoveEvent( TQMouseEvent *e ); + void contentsMousePressEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); + void timerEvent( TQTimerEvent * ); + void viewportPaintEvent( TQPaintEvent *e ); private: - QListViewItem *oldCurrent; - QListViewItem *dropItem; -/* QTimer* autoopen_timer;*/ - QPoint presspos; + TQListViewItem *oldCurrent; + TQListViewItem *dropItem; +/* TQTimer* autoopen_timer;*/ + TQPoint presspos; bool mousePressed; int dropTimer; bool m_recentDrop; signals: - void attach(const QString &, const QString &); - void extendCircuit(const QString &, const QString &, bool); - void createCircuit(const QString &, bool); - void itemAdded(QListViewItem *); + void attach(const TQString &, const TQString &); + void extendCircuit(const TQString &, const TQString &, bool); + void createCircuit(const TQString &, bool); + void itemAdded(TQListViewItem *); -/* void dragEnterEvent( QDragEnterEvent *evt ); - void dropEvent( QDropEvent *evt ); - void contentsMousePressEvent( QMouseEvent *evt ); - void contentsMouseMoveEvent( QMouseEvent * );*/ -// QDragObject *dragObject(); +/* void dragEnterEvent( TQDragEnterEvent *evt ); + void dropEvent( TQDropEvent *evt ); + void contentsMousePressEvent( TQMouseEvent *evt ); + void contentsMouseMoveEvent( TQMouseEvent * );*/ +// TQDragObject *dragObject(); // private: // bool dragging; diff --git a/src/firewallsproxies.ui b/src/firewallsproxies.ui index f43bb31..24af91d 100644 --- a/src/firewallsproxies.ui +++ b/src/firewallsproxies.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FirewallsProxies</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>FirewallsProxies</cstring> </property> @@ -30,11 +30,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_UseBridges</cstring> </property> @@ -70,7 +70,7 @@ </size> </property> </spacer> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>pushButton3</cstring> </property> @@ -78,7 +78,7 @@ <string>Fetch Listings</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -86,7 +86,7 @@ <string>You can fetch a list of servers from http://bridges.torproject.org</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -97,7 +97,7 @@ <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>BridgePanel</cstring> </property> @@ -115,7 +115,7 @@ <property name="title"> <string>Restrictive Firewall Avoidance</string> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushBridgeAdd</cstring> </property> @@ -134,7 +134,7 @@ <string>Alt+A</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>BridgePort</cstring> </property> @@ -150,7 +150,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>FirewallLabel_2</cstring> </property> @@ -175,7 +175,7 @@ <p>The servers are known as 'bridges'.</p></string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>BridgeAddress</cstring> </property> @@ -188,7 +188,7 @@ </rect> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>BridgeKey</cstring> </property> @@ -201,7 +201,7 @@ </rect> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Address</string> @@ -267,7 +267,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -278,7 +278,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_FascistFirewall</cstring> </property> @@ -286,7 +286,7 @@ <string>My Firewall Only Lets Certain Ports Out</string> </property> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>Proxies</cstring> </property> @@ -300,7 +300,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>kcfg_HttpProxyAuthenticatorUserName</cstring> </property> @@ -308,7 +308,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -316,7 +316,7 @@ <string>Port:</string> </property> </widget> - <widget class="QLineEdit" row="4" column="3"> + <widget class="TQLineEdit" row="4" column="3"> <property name="name"> <cstring>kcfg_HttpsProxyAuthenticatorPassword</cstring> </property> @@ -324,7 +324,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel2_4_3_2</cstring> </property> @@ -332,7 +332,7 @@ <string>User Name:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="3"> + <widget class="TQSpinBox" row="3" column="3"> <property name="name"> <cstring>kcfg_HttpsProxyPort</cstring> </property> @@ -340,12 +340,12 @@ <number>99999</number> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>kcfg_HttpsProxyHost</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="3"> + <widget class="TQLineEdit" row="1" column="3"> <property name="name"> <cstring>kcfg_HttpProxyAuthenticatorPassword</cstring> </property> @@ -353,7 +353,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -361,7 +361,7 @@ <string><b>HTTPS Proxy</b></string> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>textLabel2_4_2_2_2</cstring> </property> @@ -369,7 +369,7 @@ <string>Password:</string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel3_3_2</cstring> </property> @@ -377,7 +377,7 @@ <string>Port:</string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>kcfg_HttpsProxyAuthenticatorUserName</cstring> </property> @@ -385,7 +385,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_3_2</cstring> </property> @@ -393,7 +393,7 @@ <string>Address:</string> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2_4_2_3</cstring> </property> @@ -401,7 +401,7 @@ <string>Password:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_HttpProxyHost</cstring> </property> @@ -409,7 +409,7 @@ <string></string> </property> </widget> - <widget class="QSpinBox" row="0" column="3"> + <widget class="TQSpinBox" row="0" column="3"> <property name="name"> <cstring>kcfg_HttpProxyPort</cstring> </property> @@ -417,7 +417,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -425,7 +425,7 @@ <string>Address:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_4_4</cstring> </property> @@ -435,7 +435,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_UseProxy</cstring> </property> @@ -443,7 +443,7 @@ <string>I Use a Proxy to Access the Internet</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>Firewall</cstring> </property> @@ -465,7 +465,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>FirewallLabel2</cstring> </property> @@ -473,7 +473,7 @@ <string>Prevent firewall time-outs by sending something every</string> </property> </widget> - <widget class="QListView" row="0" column="1"> + <widget class="TQListView" row="0" column="1"> <column> <property name="text"> <string>Port</string> @@ -506,7 +506,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>kcfg_KeepalivePeriod</cstring> </property> @@ -520,7 +520,7 @@ <number>9999</number> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>pushAdd</cstring> </property> @@ -531,7 +531,7 @@ <string>Alt+A</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>Port</cstring> </property> @@ -539,7 +539,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>FirewallLabel</cstring> </property> @@ -571,9 +571,9 @@ </connection> <connection> <sender>ReachableAddresses</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>FirewallsProxies</receiver> - <slot>ReachableAddresses_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>ReachableAddresses_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>kcfg_FascistFirewall</sender> @@ -589,21 +589,21 @@ </connection> <connection> <sender>kcfg_HttpProxyHost</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>FirewallsProxies</receiver> - <slot>kcfg_HttpProxyHost_textChanged(const QString&)</slot> + <slot>kcfg_HttpProxyHost_textChanged(const TQString&)</slot> </connection> <connection> <sender>kcfg_HttpProxyAuthenticatorUserName</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>FirewallsProxies</receiver> - <slot>kcfg_HttpProxyAuthenticatorUserName_textChanged(const QString&)</slot> + <slot>kcfg_HttpProxyAuthenticatorUserName_textChanged(const TQString&)</slot> </connection> <connection> <sender>kcfg_HttpProxyAuthenticatorPassword</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>FirewallsProxies</receiver> - <slot>kcfg_HttpProxyAuthenticatorPassword_textChanged(const QString&)</slot> + <slot>kcfg_HttpProxyAuthenticatorPassword_textChanged(const TQString&)</slot> </connection> <connection> <sender>kcfg_HttpProxyPort</sender> @@ -625,9 +625,9 @@ </connection> <connection> <sender>Bridge</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>FirewallsProxies</receiver> - <slot>Bridge_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>Bridge_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>pushButton3</sender> @@ -644,17 +644,17 @@ </signals> <slots> <slot>pushAdd_clicked()</slot> - <slot>ReachableAddresses_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>ReachableAddresses_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> <slot>kcfg_FascistFirewall_toggled( bool on )</slot> <slot>kcfg_UseProxy_toggled( bool on )</slot> - <slot>kcfg_HttpProxyHost_textChanged( const QString & text )</slot> + <slot>kcfg_HttpProxyHost_textChanged( const TQString & text )</slot> <slot>kcfg_HttpProxyPort_valueChanged( int text )</slot> - <slot>kcfg_HttpProxyAuthenticatorUserName_textChanged( const QString & text )</slot> - <slot>kcfg_HttpProxyAuthenticatorPassword_textChanged( const QString & text )</slot> + <slot>kcfg_HttpProxyAuthenticatorUserName_textChanged( const TQString & text )</slot> + <slot>kcfg_HttpProxyAuthenticatorPassword_textChanged( const TQString & text )</slot> <slot>pushBridgeAdd_clicked()</slot> <slot>kcfg_UseBridges_toggled( bool on )</slot> - <slot>Bridge_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>Bridge_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteBridgesEntry()</slot> <slot>slotGetBridges()</slot> <slot>parseBridges()</slot> diff --git a/src/firewallsproxies.ui.h b/src/firewallsproxies.ui.h index 751b54c..f9ce6a5 100644 --- a/src/firewallsproxies.ui.h +++ b/src/firewallsproxies.ui.h @@ -20,8 +20,8 @@ #include "torkconfig.h" #include <klocale.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> #include <khtml_part.h> #include <dom/html_misc.h> @@ -34,28 +34,28 @@ void FirewallsProxies::init() filelist = new KHTMLPart(); - QStringList existingMaps = TorkConfig::reachableAddresses(); - QListViewItem *tm; - for ( QStringList::Iterator it = existingMaps.begin(); it != existingMaps.end(); ++it ) + TQStringList existingMaps = TorkConfig::reachableAddresses(); + TQListViewItem *tm; + for ( TQStringList::Iterator it = existingMaps.begin(); it != existingMaps.end(); ++it ) { if ((*it).isEmpty()) continue; - QString entry = (*it).section(":",0,0); - QString port = (*it).section(":",1,1); + TQString entry = (*it).section(":",0,0); + TQString port = (*it).section(":",1,1); - tm = new QListViewItem(ReachableAddresses,port); + tm = new TQListViewItem(ReachableAddresses,port); } existingMaps = TorkConfig::bridge(); - for ( QStringList::Iterator it = existingMaps.begin(); it != existingMaps.end(); ++it ) + for ( TQStringList::Iterator it = existingMaps.begin(); it != existingMaps.end(); ++it ) { if ((*it).isEmpty()) continue; - QString entry = (*it).section(":",0,0); - QString port = (*it).section(" ",0,0).section(":",1,1); - QString key = (*it).section(" ",1); + TQString entry = (*it).section(":",0,0); + TQString port = (*it).section(" ",0,0).section(":",1,1); + TQString key = (*it).section(" ",1); - tm = new QListViewItem(Bridge,entry,port,key); + tm = new TQListViewItem(Bridge,entry,port,key); } if (TorkConfig::currentTorVersion().left(3) == "0.1"){ @@ -65,16 +65,16 @@ void FirewallsProxies::init() } void FirewallsProxies::pushAdd_clicked() { - new QListViewItem(ReachableAddresses,Port->text()); + new TQListViewItem(ReachableAddresses,Port->text()); } -void FirewallsProxies::ReachableAddresses_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void FirewallsProxies::ReachableAddresses_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( ReachableAddresses ); + TQPopupMenu *menu = new TQPopupMenu( ReachableAddresses ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -85,14 +85,14 @@ void FirewallsProxies::ReachableAddresses_contextMenuRequested( QListViewItem *, void FirewallsProxies::slotDeleteEntry( ) { - QValueList<QListViewItem*> itemsToDelete; - QListViewItemIterator it(ReachableAddresses, QListViewItemIterator::Selected); + TQValueList<TQListViewItem*> itemsToDelete; + TQListViewItemIterator it(ReachableAddresses, TQListViewItemIterator::Selected); while ( it.current() ) { itemsToDelete << it.current(); ++it; } - for ( QValueList<QListViewItem*>::Iterator itt = itemsToDelete.begin(); + for ( TQValueList<TQListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ delete (*itt); } @@ -109,7 +109,7 @@ void FirewallsProxies::kcfg_UseProxy_toggled( bool on) Proxies->setEnabled(on); } -void FirewallsProxies::kcfg_HttpProxyHost_textChanged( const QString & text) +void FirewallsProxies::kcfg_HttpProxyHost_textChanged( const TQString & text) { kcfg_HttpsProxyHost->setText(text); } @@ -121,13 +121,13 @@ void FirewallsProxies::kcfg_HttpProxyPort_valueChanged( int text) } -void FirewallsProxies::kcfg_HttpProxyAuthenticatorUserName_textChanged( const QString & text) +void FirewallsProxies::kcfg_HttpProxyAuthenticatorUserName_textChanged( const TQString & text) { kcfg_HttpsProxyAuthenticatorUserName->setText(text); } -void FirewallsProxies::kcfg_HttpProxyAuthenticatorPassword_textChanged( const QString & text) +void FirewallsProxies::kcfg_HttpProxyAuthenticatorPassword_textChanged( const TQString & text) { kcfg_HttpsProxyAuthenticatorPassword->setText(text); } @@ -137,7 +137,7 @@ void FirewallsProxies::kcfg_HttpProxyAuthenticatorPassword_textChanged( const QS void FirewallsProxies::pushBridgeAdd_clicked() { - new QListViewItem(Bridge,BridgeAddress->text(),BridgePort->text(),BridgeKey->text()); + new TQListViewItem(Bridge,BridgeAddress->text(),BridgePort->text(),BridgeKey->text()); } @@ -149,9 +149,9 @@ void FirewallsProxies::kcfg_UseBridges_toggled( bool on) } -void FirewallsProxies::Bridge_contextMenuRequested( QListViewItem *, const QPoint & point, int ) +void FirewallsProxies::Bridge_contextMenuRequested( TQListViewItem *, const TQPoint & point, int ) { - QPopupMenu *menu = new QPopupMenu( Bridge ); + TQPopupMenu *menu = new TQPopupMenu( Bridge ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteBridgesEntry()) ); @@ -162,14 +162,14 @@ void FirewallsProxies::Bridge_contextMenuRequested( QListViewItem *, const QPoin void FirewallsProxies::slotDeleteBridgesEntry( ) { - QValueList<QListViewItem*> itemsToDelete; - QListViewItemIterator it(Bridge, QListViewItemIterator::Selected); + TQValueList<TQListViewItem*> itemsToDelete; + TQListViewItemIterator it(Bridge, TQListViewItemIterator::Selected); while ( it.current() ) { itemsToDelete << it.current(); ++it; } - for ( QValueList<QListViewItem*>::Iterator itt = itemsToDelete.begin(); + for ( TQValueList<TQListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ delete (*itt); } @@ -206,17 +206,17 @@ void FirewallsProxies::parseBridges() DOM::HTMLElement elem = static_cast<DOM::HTMLElement>( linkNode ); if (elem.getAttribute("id") == "bridges"){ - QStringList bridges = QStringList::split("bridge ",elem.innerText().string()); + TQStringList bridges = TQStringList::split("bridge ",elem.innerText().string()); - for ( QStringList::Iterator it = bridges.begin(); it != bridges.end(); ++it ) + for ( TQStringList::Iterator it = bridges.begin(); it != bridges.end(); ++it ) { if ((*it).isEmpty()) continue; - QString entry = (*it).section(":",0,0); - QString port = (*it).section(" ",0,0).section(":",1,1); - QString key = (*it).section(" ",1); - if (((QListViewItem*) Bridge->findItem(key,2)) == 0) - new QListViewItem(Bridge,entry,port,key); + TQString entry = (*it).section(":",0,0); + TQString port = (*it).section(" ",0,0).section(":",1,1); + TQString key = (*it).section(" ",1); + if (((TQListViewItem*) Bridge->findItem(key,2)) == 0) + new TQListViewItem(Bridge,entry,port,key); else KMessageBox::information (this,i18n( "Already have server :%1" ).arg((*it))); } diff --git a/src/functions.cpp b/src/functions.cpp index 828222e..694f905 100644 --- a/src/functions.cpp +++ b/src/functions.cpp @@ -20,12 +20,12 @@ * Free Software Foundation, Inc., * * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qdatetime.h> +#include <ntqdatetime.h> #include <klocale.h> #include <kglobal.h> #include <kdebug.h> #include <sys/time.h> -#include <qdir.h> +#include <ntqdir.h> #include <cstdlib> #include "functions.h" @@ -37,7 +37,7 @@ namespace tk const double TO_MEG = (1024.0 * 1024.0); const double TO_GIG = (1024.0 * 1024.0 * 1024.0); - QString BytesToString(Uint64 bytes,int precision) + TQString BytesToString(Uint64 bytes,int precision) { KLocale* loc = KGlobal::locale(); if (bytes >= 1024 * 1024 * 1024) @@ -50,7 +50,7 @@ namespace tk return i18n("%1 B").arg(bytes); } - QString BytesPerSecToString(double bytes,int precision) + TQString BytesPerSecToString(double bytes,int precision) { KLocale* loc = KGlobal::locale(); if (bytes >= 1024 * 1024 * 1024) @@ -63,32 +63,32 @@ namespace tk return i18n("%1 B/s").arg(loc->formatNumber(bytes,precision < 0 ? 1 : precision)); } - QString KBytesPerSecToString(double speed,int precision) + TQString KBytesPerSecToString(double speed,int precision) { KLocale* loc = KGlobal::locale(); return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision)); } - QString DurationToString(Uint32 nsecs) + TQString DurationToString(Uint32 nsecs) { KLocale* loc = KGlobal::locale(); - QTime t; + TQTime t; int ndays = nsecs / 86400; t = t.addSecs(nsecs % 86400); - QString s = loc->formatTime(t,true,true); + TQString s = loc->formatTime(t,true,true); if (ndays > 0) s = i18n("1 day ","%n days ",ndays) + s; return s; } - QString calcBW(const QStringList &bwlist, int num) + TQString calcBW(const TQStringList &bwlist, int num) { double totalbw = 0; int numtmp=0; - for ( QStringList::ConstIterator it = bwlist.end(); it != bwlist.begin(); --it ) + for ( TQStringList::ConstIterator it = bwlist.end(); it != bwlist.begin(); --it ) { totalbw += (*it).toDouble(); numtmp++; @@ -122,53 +122,53 @@ namespace bt } -QString getFullLocation(const char *additionalPaths, const QString &name) +TQString getFullLocation(const char *additionalPaths, const TQString &name) { // do not search one path twice - QStringList paths; + TQStringList paths; // get the environment path variable paths = addPaths(getenv("PATH")); paths += addPaths(additionalPaths); - QStringList::ConstIterator dirpath = paths.begin(); - QStringList::ConstIterator end = paths.end(); + TQStringList::ConstIterator dirpath = paths.begin(); + TQStringList::ConstIterator end = paths.end(); for(; dirpath!=end; ++dirpath) { - QDir dir = *dirpath; + TQDir dir = *dirpath; if (!dir.exists()) continue; - QFile inf(*dirpath+'/'+name); + TQFile inf(*dirpath+'/'+name); if (inf.exists()) return *dirpath+'/'+name; } - return QString(); + return TQString(); } -QStringList findPrograms(const QStringList &programList) +TQStringList findPrograms(const TQStringList &programList) { // do not search one path twice - QStringList paths; + TQStringList paths; // get the environment path variable paths = addPaths(getenv("PATH")); - QStringList tofind; - QStringList remaining; - QStringList finds; - QStringList::ConstIterator dirpath = paths.begin(); - QStringList::ConstIterator end = paths.end(); + TQStringList tofind; + TQStringList remaining; + TQStringList finds; + TQStringList::ConstIterator dirpath = paths.begin(); + TQStringList::ConstIterator end = paths.end(); tofind = programList; remaining = tofind; for(; dirpath!=end; ++dirpath) { - QDir dir = *dirpath; + TQDir dir = *dirpath; if (!dir.exists()) continue; - for ( QStringList::Iterator it = tofind.begin(); it != tofind.end(); ++it ){ - QFile inf(*dirpath+'/'+*it); + for ( TQStringList::Iterator it = tofind.begin(); it != tofind.end(); ++it ){ + TQFile inf(*dirpath+'/'+*it); if (inf.exists()){ finds.append(*it); remaining.remove(*it); @@ -181,16 +181,16 @@ QStringList findPrograms(const QStringList &programList) } -QStringList addPaths(const char *env_path){ +TQStringList addPaths(const char *env_path){ // do not search one path twice - QStringList paths; + TQStringList paths; /* // get the environment path variable char* env_path = getenv("PATH");*/ if( env_path ) { - QStringList env_pathList = QStringList::split(":", QString::fromLocal8Bit(env_path)); - for( QStringList::const_iterator it = env_pathList.begin(); it != env_pathList.end(); ++it ) { - QString p = *it; + TQStringList env_pathList = TQStringList::split(":", TQString::fromLocal8Bit(env_path)); + for( TQStringList::const_iterator it = env_pathList.begin(); it != env_pathList.end(); ++it ) { + TQString p = *it; if( p[p.length()-1] == '/' ) p.truncate( p.length()-1 ); if( !paths.contains( p ) && !paths.contains( p + "/" ) ) diff --git a/src/functions.h b/src/functions.h index 36b3f4c..84d0c87 100644 --- a/src/functions.h +++ b/src/functions.h @@ -22,27 +22,27 @@ #ifndef FUNCTIONS_H #define FUNCTIONS_H -#include <qstring.h> -#include <qstringlist.h> -#include <qdir.h> +#include <ntqstring.h> +#include <ntqstringlist.h> +#include <ntqdir.h> #include "constants.h" #include <map> -QString getFullLocation(const char *additionalPaths, const QString &name); +TQString getFullLocation(const char *additionalPaths, const TQString &name); -QStringList findPrograms(const QStringList &programList); +TQStringList findPrograms(const TQStringList &programList); -QStringList addPaths(const char *env_path); +TQStringList addPaths(const char *env_path); using namespace bt; namespace tk { - QString BytesToString(bt::Uint64 bytes,int precision = -1); - QString KBytesPerSecToString(double speed,int precision = 1); - QString BytesPerSecToString(double bytes,int precision = 1); - QString DurationToString(bt::Uint32 nsecs); - QString calcBW(const QStringList &bwlist, int num); + TQString BytesToString(bt::Uint64 bytes,int precision = -1); + TQString KBytesPerSecToString(double speed,int precision = 1); + TQString BytesPerSecToString(double bytes,int precision = 1); + TQString DurationToString(bt::Uint32 nsecs); + TQString calcBW(const TQStringList &bwlist, int num); template<class T> int CompareVal(T a,T b) { diff --git a/src/hiddensrvs.ui b/src/hiddensrvs.ui index 21a4c09..cb86f1c 100644 --- a/src/hiddensrvs.ui +++ b/src/hiddensrvs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MyHidden</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MyHidden</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>startService</cstring> </property> @@ -49,7 +49,7 @@ <string>Start Service</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>deleteService</cstring> </property> @@ -57,7 +57,7 @@ <string>Delete Service</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>startAllServices</cstring> </property> @@ -65,7 +65,7 @@ <string>Start All Services</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>createService</cstring> </property> @@ -73,7 +73,7 @@ <string>Create Service</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>testService</cstring> </property> @@ -81,7 +81,7 @@ <string>Test Service</string> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>publishService</cstring> </property> @@ -89,7 +89,7 @@ <string>Publish Service</string> </property> </widget> - <widget class="QListView" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQListView" row="1" column="0" rowspan="1" colspan="4"> <column> <property name="text"> <string>Tor Address</string> @@ -160,7 +160,7 @@ <cstring>servicesList</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -223,7 +223,7 @@ </includes> <slots> <slot>createService_clicked()</slot> - <slot>addService( const QString & nick, const QString & publicport, const QString & actualaddress, const QString & toraddress, const QString & folder, const QString & servicefolder )</slot> + <slot>addService( const TQString & nick, const TQString & publicport, const TQString & actualaddress, const TQString & toraddress, const TQString & folder, const TQString & servicefolder )</slot> <slot>deleteService_clicked()</slot> <slot>startService_clicked()</slot> <slot>thttpdprocExited(KProcess *proc)</slot> diff --git a/src/hiddensrvs.ui.h b/src/hiddensrvs.ui.h index 8c2e2f8..fd2930a 100644 --- a/src/hiddensrvs.ui.h +++ b/src/hiddensrvs.ui.h @@ -22,8 +22,8 @@ #include "hidsrvwizard.h" #include <klocale.h> #include <kdebug.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kurl.h> #include <kapplication.h> #include <kprocio.h> @@ -33,13 +33,13 @@ void MyHidden::init() { - QStringList hiddenServices = TorkConfig::hiddenServices(); - for ( QStringList::Iterator it = hiddenServices.begin(); it != hiddenServices.end(); ++it ) + TQStringList hiddenServices = TorkConfig::hiddenServices(); + for ( TQStringList::Iterator it = hiddenServices.begin(); it != hiddenServices.end(); ++it ) { if ((*it).isEmpty()) continue; - new QListViewItem(servicesList,(*it).section("\n",-6,-6),(*it).section("\n",-5,-5), + new TQListViewItem(servicesList,(*it).section("\n",-6,-6),(*it).section("\n",-5,-5), (*it).section("\n",-4,-4),(*it).section("\n",-3,-3),(*it).section("\n",-2,-2),(*it).section("\n",-1)); } @@ -60,12 +60,12 @@ void MyHidden::createService_clicked() if (static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor()){ HidSrvWizard wizard; wizard.setCaption( i18n( "Hidden Services Wizard" )); - connect( &wizard, SIGNAL(createService(const QString&,const QString&)),this->topLevelWidget()->parent(), SLOT(createService(const QString&,const QString& )) ); - connect( &wizard, SIGNAL(addService(const QString&,const QString&,const QString&,const QString&,const QString&,const QString&)), SLOT(addService(const QString&,const QString&,const QString&,const QString&,const QString&,const QString&)) ); + connect( &wizard, SIGNAL(createService(const TQString&,const TQString&)),this->topLevelWidget()->parent(), SLOT(createService(const TQString&,const TQString& )) ); + connect( &wizard, SIGNAL(addService(const TQString&,const TQString&,const TQString&,const TQString&,const TQString&,const TQString&)), SLOT(addService(const TQString&,const TQString&,const TQString&,const TQString&,const TQString&,const TQString&)) ); wizard.exec(); }else{ - QString caption = i18n("Not Connected To Tor!"); - QString message = i18n("<p>TorK needs to be connected to Tor in order to create a hidden service. <br>" + TQString caption = i18n("Not Connected To Tor!"); + TQString message = i18n("<p>TorK needs to be connected to Tor in order to create a hidden service. <br>" "<b>To create a hidden service, first start TorK!"); KMessageBox::information (this, message, caption); } @@ -76,10 +76,10 @@ void MyHidden::createService_clicked() void MyHidden::updateServices() { if ( servicesList->childCount() > 0 ) { - QStringList v_hiddenServices; - QListViewItemIterator it( servicesList ); + TQStringList v_hiddenServices; + TQListViewItemIterator it( servicesList ); while ( it.current() ) { - QString s_hiddenServices = it.current()->text(0) + "\n" + it.current()->text(1) + TQString s_hiddenServices = it.current()->text(0) + "\n" + it.current()->text(1) + "\n" + it.current()->text(2) + "\n" + it.current()->text(3) + "\n" + it.current()->text(4)+ "\n" + it.current()->text(5); v_hiddenServices.append(s_hiddenServices); @@ -91,20 +91,20 @@ void MyHidden::updateServices() TorkConfig::writeConfig(); } -void MyHidden::addService(const QString& nick,const QString& publicport,const QString& actualaddress,const QString& toraddress,const QString& folder,const QString& servicefolder) +void MyHidden::addService(const TQString& nick,const TQString& publicport,const TQString& actualaddress,const TQString& toraddress,const TQString& folder,const TQString& servicefolder) { - new QListViewItem(servicesList,toraddress,nick,publicport,actualaddress,folder,servicefolder); + new TQListViewItem(servicesList,toraddress,nick,publicport,actualaddress,folder,servicefolder); updateServices(); } void MyHidden::deleteService_clicked() { - QString serviceDetails = servicesList->currentItem()->text(5); - QString serviceAddress = servicesList->currentItem()->text(0); + TQString serviceDetails = servicesList->currentItem()->text(5); + TQString serviceAddress = servicesList->currentItem()->text(0); delete servicesList->currentItem(); - QString caption = i18n("Service deleted!"); - QString message = i18n("<p>The hidden service %1 has been de-configured. <br>" + TQString caption = i18n("Service deleted!"); + TQString message = i18n("<p>The hidden service %1 has been de-configured. <br>" "<b>However you will need to delete the service details in %2 yourself! Please do this!").arg(serviceAddress).arg(serviceDetails); KMessageBox::information (this, message, caption); @@ -118,7 +118,7 @@ void MyHidden::startService_clicked() KProcIO* thttpdproc = new KProcIO(); thttpdproc->setUseShell(TRUE); - QString curpath = (QString) getenv("PATH"); + TQString curpath = (TQString) getenv("PATH"); thttpdproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"); *thttpdproc << "thttpd -p " << servicesList->currentItem()->text(3).section(":",1) @@ -134,8 +134,8 @@ void MyHidden::startService_clicked() void MyHidden::thttpdprocExited(KProcess *proc) { - QString caption; - QString message; + TQString caption; + TQString message; if (proc->exitStatus() == 0){ caption = i18n("Hidden Web Service Started"); @@ -177,11 +177,11 @@ void MyHidden::testService_clicked() { if ((TorkConfig::kDEUsesTor()) && (static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor())){ - KURL url = QString("http://%1").arg(servicesList->currentItem()->text(0)); + KURL url = TQString("http://%1").arg(servicesList->currentItem()->text(0)); kapp->invokeBrowser(url.url(), "0"); }else{ - QString caption = i18n("Not Connected To Tor!"); - QString message = i18n("<p>Konqueror and TorK need to be using Tor in order to test a hidden service. <br>" + TQString caption = i18n("Not Connected To Tor!"); + TQString message = i18n("<p>Konqueror and TorK need to be using Tor in order to test a hidden service. <br>" "<b>To test a hidden service, first start TorK and enable Konqueror to use Tor!"); KMessageBox::information (this, message, caption); } @@ -194,11 +194,11 @@ void MyHidden::publishService_clicked() if ((TorkConfig::kDEUsesTor()) && (static_cast<tork*>(this->topLevelWidget()->parentWidget())->connectedToTor())){ - KURL url = QString("tor:6sxoyfb3h2nvok2d.onion/tor/FrontPage?action=edit"); + KURL url = TQString("tor:6sxoyfb3h2nvok2d.onion/tor/FrontPage?action=edit"); kapp->invokeBrowser(url.url(), "0"); }else{ - QString caption = i18n("Not Connected To Tor!"); - QString message = i18n("<p>Konqueror and TorK need to be using Tor in order to publish a hidden service. <br>" + TQString caption = i18n("Not Connected To Tor!"); + TQString message = i18n("<p>Konqueror and TorK need to be using Tor in order to publish a hidden service. <br>" "<b>To publish a hidden service, first start TorK and enable Konqueror to use Tor!"); KMessageBox::information (this, message, caption); } diff --git a/src/hidsrvwizard.ui b/src/hidsrvwizard.ui index 1497ad5..e4dd0c2 100644 --- a/src/hidsrvwizard.ui +++ b/src/hidsrvwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>HidSrvWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>HidSrvWizard</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Form1</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -26,14 +26,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> <property name="title"> <string>Service Types</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>localWeb</cstring> </property> @@ -49,7 +49,7 @@ <string>A local web service.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>remote</cstring> </property> @@ -69,7 +69,7 @@ </property> </widget> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -79,7 +79,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>LocalWebService</cstring> </property> @@ -90,7 +90,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -98,7 +98,7 @@ <string><blockquote>To run a local web service, the Tor people recommend thttpd. Would you like to download and install thttpd now? If not, you can just continue and set up the address and port of the service as normal.</blockquote></string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>downloadThttpd</cstring> </property> @@ -142,7 +142,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ServiceName</cstring> </property> @@ -153,7 +153,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -229,7 +229,7 @@ </size> </property> </spacer> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>Nick</cstring> </property> @@ -242,7 +242,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>RedirectService</cstring> </property> @@ -253,12 +253,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="2" column="0"> + <widget class="TQLineEdit" row="2" column="0"> <property name="name"> <cstring>RedirectAddress</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -266,7 +266,7 @@ <string>Enter the address and port your service will redirect to:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="2"> + <widget class="TQSpinBox" row="0" column="2"> <property name="name"> <cstring>NonWebPort</cstring> </property> @@ -274,7 +274,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -282,7 +282,7 @@ <string>Enter the port your hidden service will listen on:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -290,7 +290,7 @@ <string>e.g. www.google.com<br>or localhost</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>RedirectPort</cstring> </property> @@ -298,7 +298,7 @@ <number>999999999</number> </property> </widget> - <widget class="QLabel" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -308,7 +308,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>LocalWebServiceFiles</cstring> </property> @@ -319,7 +319,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel5_2</cstring> </property> @@ -327,7 +327,7 @@ <string>Select or accept the location of the files you will serve:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -335,7 +335,7 @@ <string>Enter the port your hidden service will listen on:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel6_2_2</cstring> </property> @@ -343,7 +343,7 @@ <string>Enter the local port for your hidden service:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>localWebPort</cstring> </property> @@ -354,7 +354,7 @@ <number>5222</number> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>WebPort</cstring> </property> @@ -375,14 +375,14 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ServiceConfigured</cstring> </property> <attribute name="title"> <string>Service Configured.</string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6_3</cstring> </property> @@ -399,14 +399,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>GatherDetails</cstring> </property> <attribute name="title"> <string>Gathering Service Details from Tor</string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>GatheringDetailsText</cstring> </property> @@ -461,13 +461,13 @@ <include location="local" impldecl="in implementation">hidsrvwizard.ui.h</include> </includes> <signals> - <signal>createService(const QString &,const QString &)</signal> - <signal>addService(const QString &,const QString &,const QString &,const QString &,const QString &,const QString &)</signal> + <signal>createService(const TQString &,const TQString &)</signal> + <signal>addService(const TQString &,const TQString &,const TQString &,const TQString &,const TQString &,const TQString &)</signal> </signals> <slots> <slot>localWeb_toggled( bool state )</slot> <slot>downloadThttpd_clicked()</slot> - <slot>showPage( QWidget * w )</slot> + <slot>showPage( TQWidget * w )</slot> <slot>checkServiceDetails()</slot> <slot>accept()</slot> <slot>reject()</slot> diff --git a/src/hidsrvwizard.ui.h b/src/hidsrvwizard.ui.h index 685f01f..3cb31a8 100644 --- a/src/hidsrvwizard.ui.h +++ b/src/hidsrvwizard.ui.h @@ -20,12 +20,12 @@ #include "tork.h" #include "functions.h" -#include <qtimer.h> +#include <ntqtimer.h> #include <kmessagebox.h> #include <cstdlib> bool local; -QString thttpd; +TQString thttpd; void HidSrvWizard::init() @@ -36,11 +36,11 @@ void HidSrvWizard::init() setAppropriate ( ServiceName, true ); setAppropriate ( RedirectService, true ); - QString location = getenv("HOME"); + TQString location = getenv("HOME"); location += "/.tork"; - QDir torkdir(location); + TQDir torkdir(location); if (!torkdir.exists() && !torkdir.mkdir(location)){ - KMessageBox::information (this,QString("Couldn't create directory: %1. Check the permissions!").arg(location)); + KMessageBox::information (this,TQString("Couldn't create directory: %1. Check the permissions!").arg(location)); reject(); } @@ -79,18 +79,18 @@ void HidSrvWizard::downloadThttpd_clicked() void -HidSrvWizard::showPage( QWidget *w ) //virtual +HidSrvWizard::showPage( TQWidget *w ) //virtual { - QWizard::showPage( w ); + TQWizard::showPage( w ); if (currentPage() == this->GatherDetails){ if (local) - emit createService(QString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text()), QString("%1 localhost:%2").arg(WebPort->text()).arg(localWebPort->text())); + emit createService(TQString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text()), TQString("%1 localhost:%2").arg(WebPort->text()).arg(localWebPort->text())); else - emit createService(QString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text()), QString("%1 %2:%3").arg(NonWebPort->text()).arg(RedirectAddress->text()).arg(RedirectPort->text())); + emit createService(TQString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text()), TQString("%1 %2:%3").arg(NonWebPort->text()).arg(RedirectAddress->text()).arg(RedirectPort->text())); GatheringDetailsText->setText("Please wait while Tor attempts to create the service."); - QTimer::singleShot( 3000, this, SLOT(checkServiceDetails()) ); + TQTimer::singleShot( 3000, this, SLOT(checkServiceDetails()) ); finishButton()->setEnabled(false); } @@ -100,8 +100,8 @@ void HidSrvWizard::checkServiceDetails() { - QString hostname; - QFile inf(QString("%1/.tork/%2/hostname").arg(getenv("HOME")).arg(Nick->text())); + TQString hostname; + TQFile inf(TQString("%1/.tork/%2/hostname").arg(getenv("HOME")).arg(Nick->text())); if ( inf.open(IO_ReadOnly) ) { inf.readLine(hostname,50); inf.close(); @@ -114,7 +114,7 @@ HidSrvWizard::checkServiceDetails() cancelButton()->setEnabled(false); - QString serviceDetails = "Hidden Service Hostname: "; + TQString serviceDetails = "Hidden Service Hostname: "; serviceDetails += hostname; serviceDetails += "<br>"; if (local){ @@ -126,7 +126,7 @@ HidSrvWizard::checkServiceDetails() serviceDetails += "<br>"; serviceDetails += "Tor Facing Port:"; serviceDetails += localWebPort->text(); - emit addService(Nick->text(),WebPort->text(),QString("localhost:%1").arg(localWebPort->text()),hostname,FilesToServe->url(),QString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text())); + emit addService(Nick->text(),WebPort->text(),TQString("localhost:%1").arg(localWebPort->text()),hostname,FilesToServe->url(),TQString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text())); }else{ serviceDetails += "Redirecting to:"; @@ -138,7 +138,7 @@ HidSrvWizard::checkServiceDetails() serviceDetails += "Serving Tor Network with Port:"; serviceDetails += NonWebPort->text(); serviceDetails += "<br>"; - emit addService(Nick->text(),NonWebPort->text(),QString("%1:%2").arg(RedirectAddress->text()).arg(RedirectPort->text()),hostname,"",QString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text())); + emit addService(Nick->text(),NonWebPort->text(),TQString("%1:%2").arg(RedirectAddress->text()).arg(RedirectPort->text()),hostname,"",TQString("%1/.tork/%2/").arg(getenv("HOME")).arg(Nick->text())); } @@ -151,13 +151,13 @@ HidSrvWizard::checkServiceDetails() void HidSrvWizard::accept() { - QDialog::accept(); + TQDialog::accept(); } void HidSrvWizard::reject() { - QDialog::reject(); + TQDialog::reject(); } diff --git a/src/hitwidget.cpp b/src/hitwidget.cpp index 33d021d..f62d68e 100644 --- a/src/hitwidget.cpp +++ b/src/hitwidget.cpp @@ -23,18 +23,18 @@ #include <kpushbutton.h> #include <kdebug.h> #include <kiconloader.h> -#include <qtoolbutton.h> +#include <ntqtoolbutton.h> #include <klocale.h> #include <kurllabel.h> #include <kglobalsettings.h> -#include <qlayout.h> +#include <ntqlayout.h> /*#include <konq_filetip.h>*/ -#include <qscrollview.h> -#include <qcombobox.h> +#include <ntqscrollview.h> +#include <ntqcombobox.h> -HitWidget::HitWidget(QString uri, QString mimetype, KWidgetListbox *parent, const char *name) +HitWidget::HitWidget(TQString uri, TQString mimetype, KWidgetListbox *parent, const char *name) : HitWidgetLayout(parent, name), m_uri(uri), m_mimetype(mimetype), m_collapsed(false), - m_was_collapsed(false), m_icon(QString::null) + m_was_collapsed(false), m_icon(TQString::null) { HitWidgetLayoutLayout->setMargin(4); toolButton1->setEnabled(false); @@ -55,7 +55,7 @@ HitWidget::~HitWidget() /* delete pFileTip;*/ } -void HitWidget::setIcon(const QString name) +void HitWidget::setIcon(const TQString name) { m_icon = name; if (m_collapsed) @@ -89,8 +89,8 @@ void HitWidget::setCollapsed(bool collapsed) description->setHidden(true); properties->setHidden(true); score->setHidden(true); - icon->setMinimumSize( QSize( 64, 16 ) ); - icon->setMaximumSize( QSize( 64, 16 ) ); + icon->setMinimumSize( TQSize( 64, 16 ) ); + icon->setMaximumSize( TQSize( 64, 16 ) ); m_collapsed = collapsed; } else { @@ -99,8 +99,8 @@ void HitWidget::setCollapsed(bool collapsed) description->setHidden(false); properties->setHidden(false); //score->setHidden(false); - icon->setMinimumSize( QSize( 64, 64 ) ); - icon->setMaximumSize( QSize( 64, 64 ) ); + icon->setMinimumSize( TQSize( 64, 64 ) ); + icon->setMaximumSize( TQSize( 64, 64 ) ); m_collapsed = collapsed; emit uncollapsed(this); } @@ -114,27 +114,27 @@ bool HitWidget::isCollapsed() const return m_collapsed; } -void HitWidget::setDescriptionText(QString text) +void HitWidget::setDescriptionText(TQString text) { description->setText(text); } -void HitWidget::setPropertiesText(QString text) +void HitWidget::setPropertiesText(TQString text) { properties->setText(text); } -void HitWidget::insertHeaderWidget( int index, QWidget * widget) +void HitWidget::insertHeaderWidget( int index, TQWidget * widget) { layoutHeader->insertWidget(index,widget); } -void HitWidget::insertHitWidget( int index, QWidget * widget) +void HitWidget::insertHitWidget( int index, TQWidget * widget) { layoutButton->insertWidget(index,widget); } -void HitWidget::insertTextWidget( int index, QWidget * widget) +void HitWidget::insertTextWidget( int index, TQWidget * widget) { layoutText->insertWidget(index,widget); } @@ -144,18 +144,18 @@ void HitWidget::insertHitSpacing( int index, int size) layoutButton->insertSpacing(index,size); } -QString HitWidget::uri() const +TQString HitWidget::uri() const { return m_uri; } -void HitWidget::setUri(const QString uri) +void HitWidget::setUri(const TQString uri) { /* pFileTip->setItem(0L);*/ m_uri = uri; } -QString HitWidget::mimetype() const +TQString HitWidget::mimetype() const { return m_mimetype; } @@ -179,17 +179,17 @@ void HitWidget::adjustSize() HitWidgetLayout::adjustSize(); } -bool HitWidget::eventFilter( QObject *, QEvent * ) +bool HitWidget::eventFilter( TQObject *, TQEvent * ) { /* if ( obj == icon && !m_uri.isEmpty() ) { - if ( ev->type() == QEvent::Enter && parent() ) { + if ( ev->type() == TQEvent::Enter && parent() ) { pFileTip->setOptions(true, true, 6); KFileItem *fileitem=new KFileItem(m_uri,m_mimetype,KFileItem::Unknown); - QPoint viewport = qsv->viewport()->mapFromGlobal(mapToGlobal(icon->pos())); - QRect qr(qsv->viewportToContents(viewport),QSize(icon->width()*2,icon->height())); + TQPoint viewport = qsv->viewport()->mapFromGlobal(mapToGlobal(icon->pos())); + TQRect qr(qsv->viewportToContents(viewport),TQSize(icon->width()*2,icon->height())); pFileTip->setItem(fileitem,qr,icon->pixmap()); } - else if ( ev->type() == QEvent::Leave ) + else if ( ev->type() == TQEvent::Leave ) pFileTip->setItem(0L); return HitWidgetLayout::eventFilter( obj, ev ); }*/ @@ -198,10 +198,10 @@ bool HitWidget::eventFilter( QObject *, QEvent * ) void HitWidget::changeTerminalUrl(int ) { - QString app = score->currentText(); - QString title = shellTitles[score->currentText()]; + TQString app = score->currentText(); + TQString title = shellTitles[score->currentText()]; - icon->setURL(QString("%1 %2").arg(app).arg(title)); + icon->setURL(TQString("%1 %2").arg(app).arg(title)); } diff --git a/src/hitwidget.h b/src/hitwidget.h index 6c3eaaa..4c48072 100644 --- a/src/hitwidget.h +++ b/src/hitwidget.h @@ -23,35 +23,35 @@ #include <hitwidget_layout.h> #include "kwidgetlistbox.h" -class QScrollView; +class TQScrollView; // class KonqFileTip; class HitWidget : public HitWidgetLayout { Q_OBJECT public: - HitWidget(QString uri, QString mimetype, KWidgetListbox *parent = 0, const char *name = 0); + HitWidget(TQString uri, TQString mimetype, KWidgetListbox *parent = 0, const char *name = 0); ~HitWidget(); void setCollapsed(bool); bool isCollapsed() const; - void setIcon(QString name); + void setIcon(TQString name); - void setDescriptionText(QString text); - void setPropertiesText(QString text); - void setUri(const QString uri); - QString uri() const; - QString mimetype() const; + void setDescriptionText(TQString text); + void setPropertiesText(TQString text); + void setUri(const TQString uri); + TQString uri() const; + TQString mimetype() const; - void insertHeaderWidget( int index, QWidget * widget); - void insertTextWidget( int index, QWidget * widget); - void insertHitWidget( int index, QWidget * widget); + void insertHeaderWidget( int index, TQWidget * widget); + void insertTextWidget( int index, TQWidget * widget); + void insertHitWidget( int index, TQWidget * widget); void insertHitSpacing( int index, int size); virtual void adjustSize(); - virtual bool eventFilter(QObject*, QEvent*); + virtual bool eventFilter(TQObject*, TQEvent*); - QMap<QString,QString> shellTitles; + TQMap<TQString,TQString> shellTitles; signals: void uncollapsed(HitWidget*); @@ -62,10 +62,10 @@ class HitWidget : public HitWidgetLayout private: KWidgetListbox* qsv; - QString m_uri, m_mimetype; + TQString m_uri, m_mimetype; /* KonqFileTip* pFileTip;*/ bool m_collapsed, m_was_collapsed; - QString m_icon; + TQString m_icon; }; #endif diff --git a/src/hitwidget_layout.ui b/src/hitwidget_layout.ui index 46a7ce2..3f1676c 100644 --- a/src/hitwidget_layout.ui +++ b/src/hitwidget_layout.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>HitWidgetLayout</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HitWidgetLayout</cstring> </property> @@ -19,7 +19,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QToolButton" row="0" column="0"> + <widget class="TQToolButton" row="0" column="0"> <property name="name"> <cstring>toolButton1</cstring> </property> @@ -47,7 +47,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" rowspan="2" column="2"> + <widget class="TQLayoutWidget" row="0" rowspan="2" column="2"> <property name="name"> <cstring>layoutIcon</cstring> </property> @@ -86,7 +86,7 @@ <set>AlignCenter</set> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>score</cstring> </property> @@ -152,7 +152,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="4" rowspan="2"> + <widget class="TQLayoutWidget" row="0" column="4" rowspan="2"> <property name="name"> <cstring>layout8</cstring> </property> @@ -166,7 +166,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layoutHeader</cstring> </property> @@ -193,7 +193,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout27</cstring> </property> @@ -224,7 +224,7 @@ </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layoutText</cstring> </property> @@ -238,7 +238,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>description</cstring> </property> @@ -257,7 +257,7 @@ <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>properties</cstring> </property> @@ -276,7 +276,7 @@ <set>WordBreak|AlignTop</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layoutButton</cstring> </property> diff --git a/src/introwizard.ui b/src/introwizard.ui index 97117ca..fc25015 100644 --- a/src/introwizard.ui +++ b/src/introwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>IntroWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>IntroWizard</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Introduction To TorK</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="2"> + <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> <cstring>layout1</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel3</cstring> </property> @@ -48,7 +48,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -106,7 +106,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -120,7 +120,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -145,7 +145,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -156,7 +156,7 @@ <p align="left">In such cases, you need to be sure that you have not bypassed Tor to get the IP address. </p></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>pixmapLabel3_2</cstring> </property> @@ -170,7 +170,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>pixmapLabel4</cstring> </property> @@ -184,7 +184,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -192,7 +192,7 @@ <string><i>Using hostname - www.showmyip.com</i></string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -202,7 +202,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -213,7 +213,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>pixmapLabel4_2</cstring> </property> @@ -241,7 +241,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2_2_3</cstring> </property> @@ -249,7 +249,7 @@ <string><i>Using hostname - www.showmyip.com</i></string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -259,7 +259,7 @@ <p align="left">Tor is managing internal connections using an IP address.</p></string> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel2_2_2_2</cstring> </property> @@ -267,7 +267,7 @@ <string><i>Using IP Address </i></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>pixmapLabel3_2_2</cstring> </property> @@ -283,7 +283,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -312,7 +312,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_3_2</cstring> </property> @@ -328,7 +328,7 @@ <string><i>Using hostname - www.showmyip.com</i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2_2_2</cstring> </property> @@ -346,7 +346,7 @@ <p align="left">Your socks library is bypassing Tor to resolve the hostname..</p></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2</cstring> </property> @@ -362,7 +362,7 @@ <string><i>Using IP Address </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel3_2_2_2</cstring> </property> @@ -384,7 +384,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel4_2_2</cstring> </property> @@ -407,14 +407,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -455,7 +455,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel6</cstring> </property> @@ -478,14 +478,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -526,7 +526,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2</cstring> </property> @@ -542,7 +542,7 @@ <string><i>The Fail-Safe button. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -565,7 +565,7 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -594,7 +594,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_2</cstring> </property> @@ -610,7 +610,7 @@ <string><h2>Now let's see some of TorK's other features.</h2></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel6_2_2</cstring> </property> @@ -632,7 +632,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_3_2</cstring> </property> @@ -654,7 +654,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1_2_4</cstring> </property> @@ -676,7 +676,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_2_3</cstring> </property> @@ -699,14 +699,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3</cstring> </property> @@ -745,7 +745,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2</cstring> </property> @@ -761,7 +761,7 @@ <string><i>The 'Citizen Of..' button. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1_2</cstring> </property> @@ -784,7 +784,7 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -813,7 +813,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_2</cstring> </property> @@ -830,7 +830,7 @@ <p align="left">The 'Change Identity' button allows you to switch identity at the flick of a switch.</p></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_2</cstring> </property> @@ -846,7 +846,7 @@ <string><i>The 'Change Identity' button. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1_2_2</cstring> </property> @@ -869,7 +869,7 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> @@ -898,7 +898,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_3</cstring> </property> @@ -915,7 +915,7 @@ <p align="left">You can start running a full Tor server at the press of a button. We recommend running a 'relay server' to begin with.</p></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3</cstring> </property> @@ -931,7 +931,7 @@ <string><i>The 'Run Server..' button. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1_2_3</cstring> </property> @@ -954,14 +954,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4</cstring> </property> @@ -1000,7 +1000,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5</cstring> </property> @@ -1022,7 +1022,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel6_2</cstring> </property> @@ -1045,14 +1045,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2</cstring> </property> @@ -1096,7 +1096,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2</cstring> </property> @@ -1113,7 +1113,7 @@ <p align="left">You can quickly switch to anonymous browsing while in Konqueror by using the Tork Button in the toolbar...</p></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2</cstring> </property> @@ -1130,14 +1130,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_2</cstring> </property> @@ -1177,7 +1177,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_2</cstring> </property> @@ -1199,7 +1199,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_2</cstring> </property> @@ -1215,7 +1215,7 @@ <string><i>The 'tor:' prefix in Konqueror. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_2_2</cstring> </property> @@ -1237,7 +1237,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_2_2</cstring> </property> @@ -1254,14 +1254,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_3</cstring> </property> @@ -1300,7 +1300,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_3</cstring> </property> @@ -1322,7 +1322,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_3</cstring> </property> @@ -1339,14 +1339,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_2_3</cstring> </property> @@ -1362,7 +1362,7 @@ <string><i>The 'tor:' prefix in Konqueror. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_2_4</cstring> </property> @@ -1406,7 +1406,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_2_2</cstring> </property> @@ -1425,14 +1425,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_3_2_2</cstring> </property> @@ -1448,7 +1448,7 @@ <string><i>Clicking the 'wrench' opens the Tork Config panel. </i></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_3_3</cstring> </property> @@ -1470,7 +1470,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_3_2</cstring> </property> @@ -1487,7 +1487,7 @@ <p align="left">You can modify the servers/countries you chose in the 'Tor Network' tab by accessing the 'My Network View' tab in the TorK configuration panel...</p></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_3_2</cstring> </property> @@ -1525,7 +1525,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel7</cstring> </property> @@ -1548,14 +1548,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_3_2_2</cstring> </property> @@ -1594,7 +1594,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel5_2_3_3_2</cstring> </property> @@ -1616,7 +1616,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_3_2_3</cstring> </property> @@ -1633,14 +1633,14 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WizardPage</cstring> </property> <attribute name="title"> <string></string> </attribute> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_3_2_2_2</cstring> </property> @@ -1680,7 +1680,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel8</cstring> </property> @@ -1699,7 +1699,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2_2_2_2_2_2_3_2_3_2_3_2</cstring> </property> @@ -1716,7 +1716,7 @@ </property> </widget> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Final</cstring> </property> @@ -1745,7 +1745,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_3_4_2_3_2_2_2_2</cstring> </property> @@ -1763,7 +1763,7 @@ <p align="left">Please report any bugs you encounter or improvements you would like to see in TorK to tork-users@lists.sf.net.</p></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel8_2</cstring> </property> diff --git a/src/kerrylabel.cpp b/src/kerrylabel.cpp index 4169138..9c85025 100644 --- a/src/kerrylabel.cpp +++ b/src/kerrylabel.cpp @@ -21,7 +21,7 @@ #include "kerrylabel.h" #include "hitwidget.h" -#include <qdragobject.h> +#include <ntqdragobject.h> #include <kglobalsettings.h> #include <kurl.h> #include <krun.h> @@ -31,13 +31,13 @@ #include <knewmenu.h> */ -KerryLabel::KerryLabel (QWidget* parent, const char* name) +KerryLabel::KerryLabel (TQWidget* parent, const char* name) : KURLLabel (parent, name) { dragInfo.state = diNone; } -void KerryLabel::mousePressEvent(QMouseEvent* ev) +void KerryLabel::mousePressEvent(TQMouseEvent* ev) { if (!url().isEmpty()) { @@ -56,7 +56,7 @@ void KerryLabel::mousePressEvent(QMouseEvent* ev) KURLLabel::mousePressEvent(ev); } -void KerryLabel::mouseMoveEvent(QMouseEvent* ev) +void KerryLabel::mouseMoveEvent(TQMouseEvent* ev) { if (dragInfo.state == diPending) { int distance = KGlobalSettings::dndEventDelay(); @@ -69,7 +69,7 @@ void KerryLabel::mouseMoveEvent(QMouseEvent* ev) KURLLabel::mouseMoveEvent(ev); } -void KerryLabel::mouseReleaseEvent(QMouseEvent* ev) +void KerryLabel::mouseReleaseEvent(TQMouseEvent* ev) { if ( ev->button() == LeftButton) { @@ -82,12 +82,12 @@ void KerryLabel::doDrag() { dragInfo.state = diDragging; const KURL kuri = KURL(url()); - dragInfo.dragObject = new QTextDrag("'"+kuri.url().replace("file://",QString::null)+"'", this); + dragInfo.dragObject = new TQTextDrag("'"+kuri.url().replace("file://",TQString::null)+"'", this); dragInfo.dragObject->dragCopy(); - // Don't delete the QTextDrag object. Qt will delete it when it's done with it. + // Don't delete the TQTextDrag object. TQt will delete it when it's done with it. } -// void KerryLabel::popupMenu( const QPoint &_global ) +// void KerryLabel::popupMenu( const TQPoint &_global ) // { // KFileItem item( ((HitWidget*)parent())->uri(),((HitWidget*)parent())->mimetype(),KFileItem::Unknown); // KFileItemList _items; diff --git a/src/kerrylabel.h b/src/kerrylabel.h index f6782be..9689fab 100644 --- a/src/kerrylabel.h +++ b/src/kerrylabel.h @@ -24,23 +24,23 @@ #include <kurl.h> #include <kurllabel.h> -class QTextDrag; +class TQTextDrag; class KerryLabel : public KURLLabel { Q_OBJECT public: - KerryLabel (QWidget* parent = 0L, const char* name = 0L); + KerryLabel (TQWidget* parent = 0L, const char* name = 0L); protected: - void mousePressEvent( QMouseEvent* ); - void mouseReleaseEvent( QMouseEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void mousePressEvent( TQMouseEvent* ); + void mouseReleaseEvent( TQMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); void doDrag(); // protected slots: -// void popupMenu( const QPoint &_global ); +// void popupMenu( const TQPoint &_global ); private: KURL::List kurllist; @@ -49,8 +49,8 @@ class KerryLabel : public KURLLabel struct _dragInfo { DragState state; - QPoint start; - QTextDrag *dragObject; + TQPoint start; + TQTextDrag *dragObject; } dragInfo; }; diff --git a/src/konqplugin/tork_plug_in.cpp b/src/konqplugin/tork_plug_in.cpp index cee0681..5064279 100644 --- a/src/konqplugin/tork_plug_in.cpp +++ b/src/konqplugin/tork_plug_in.cpp @@ -59,10 +59,10 @@ #include <set> -Tork_plug_in::Tork_plug_in( QObject* parent, const char* name ) +Tork_plug_in::Tork_plug_in( TQObject* parent, const char* name ) : Plugin( parent, name ) { - QPixmap pix = KGlobal::iconLoader()->loadIcon("tork", + TQPixmap pix = KGlobal::iconLoader()->loadIcon("tork", KIcon::MainToolbar); KActionMenu *menu = new KActionMenu( i18n("Anonymity Manager"), pix, actionCollection(), "tork_menu" ); @@ -139,17 +139,17 @@ void Tork_plug_in::openWithOpera() } -void Tork_plug_in::openWithBrowser(const QString &browser) +void Tork_plug_in::openWithBrowser(const TQString &browser) { KHTMLPart *htmlPart = static_cast<KHTMLPart*>( parent() ); - QString url = htmlPart->toplevelURL().url(); + TQString url = htmlPart->toplevelURL().url(); if (p_dcopServer->isApplicationRegistered ("tork")){ - QString function = QString("anonymized%1").arg(browser); + TQString function = TQString("anonymized%1").arg(browser); DCOPRef("tork", "DCOPTork").send("startEverything"); - DCOPRef("tork", "DCOPTork").send(QCString(function),url); + DCOPRef("tork", "DCOPTork").send(TQCString(function),url); }else - KRun::runCommand( QString("tork --anonymous%1 %2").arg(browser).arg(url), "tork", "tork" ); + KRun::runCommand( TQString("tork --anonymous%1 %2").arg(browser).arg(url), "tork", "tork" ); } @@ -165,15 +165,15 @@ void Tork_plug_in::toggleKDE() } -KPluginFactory::KPluginFactory( QObject* parent, const char* name ) +KPluginFactory::KPluginFactory( TQObject* parent, const char* name ) : KLibFactory( parent, name ) { s_instance = new KInstance("KPluginFactory"); } -QObject* KPluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KPluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - QObject *obj = new Tork_plug_in( parent, name ); + TQObject *obj = new Tork_plug_in( parent, name ); return obj; } diff --git a/src/konqplugin/tork_plug_in.h b/src/konqplugin/tork_plug_in.h index 4df506c..63b9216 100644 --- a/src/konqplugin/tork_plug_in.h +++ b/src/konqplugin/tork_plug_in.h @@ -49,14 +49,14 @@ class Tork_plug_in : public KParts::Plugin { Q_OBJECT public: - Tork_plug_in( QObject* parent = 0, const char* name = 0 ); + Tork_plug_in( TQObject* parent = 0, const char* name = 0 ); KAction *m_paToggleKDE ; DCOPClient* p_dcopServer; virtual ~Tork_plug_in(); private slots: void toggleKDE(); - void openWithBrowser(const QString&); + void openWithBrowser(const TQString&); void openWithFirefox(); void openWithOpera(); void showPopup(); @@ -67,12 +67,12 @@ class KPluginFactory : public KLibFactory { Q_OBJECT public: - KPluginFactory( QObject *parent = 0, const char *name = 0 ); + KPluginFactory( TQObject *parent = 0, const char *name = 0 ); ~KPluginFactory() ; - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, - const char* name = "QObject", - const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, + const char* name = "TQObject", + const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; diff --git a/src/konqueror.ui b/src/konqueror.ui index 0495b85..5f798ed 100644 --- a/src/konqueror.ui +++ b/src/konqueror.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Konq</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Konq</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -30,14 +30,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> <property name="title"> <string>Manage Proxy as follows</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_SystemProxy</cstring> </property> @@ -53,7 +53,7 @@ <string>Let my Privacy Proxy start and look after itself.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_TorkProxy</cstring> </property> @@ -78,7 +78,7 @@ <cstring>kcfg_PrivoxyLocation</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -88,7 +88,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -99,14 +99,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> <property name="title"> <string>Anonymity Safeguards</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DisableJava</cstring> </property> @@ -125,7 +125,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DisableCookies</cstring> </property> @@ -141,7 +141,7 @@ <string>Disable Cookies</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DisableBrowserIdentification</cstring> </property> @@ -157,7 +157,7 @@ <string>Disable Browser Identification</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DisablePlugins</cstring> </property> @@ -173,7 +173,7 @@ <string>Disable Plugins</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DisableCaching</cstring> </property> @@ -190,14 +190,14 @@ </property> </widget> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> <property name="title"> <string>Connect to Privacy Proxy as Follows</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -213,7 +213,7 @@ <string>HTTP:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -229,7 +229,7 @@ <string>HTTPS:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -320,7 +320,7 @@ </rect> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_KonqHttpsProxy</cstring> </property> @@ -333,7 +333,7 @@ </rect> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_KonqFtpProxy</cstring> </property> @@ -346,7 +346,7 @@ </rect> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_KonqHttpProxyPort</cstring> </property> @@ -362,7 +362,7 @@ <number>9999</number> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_KonqHttpsProxyPort</cstring> </property> @@ -378,7 +378,7 @@ <number>9999</number> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>kcfg_KonqFtpProxyPort</cstring> </property> @@ -394,7 +394,7 @@ <number>9999</number> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>kcfg_KonqHttpProxy</cstring> </property> diff --git a/src/kwidgetlistbox.cpp b/src/kwidgetlistbox.cpp index 1c32868..fd4ec78 100644 --- a/src/kwidgetlistbox.cpp +++ b/src/kwidgetlistbox.cpp @@ -22,8 +22,8 @@ #include <kglobalsettings.h> #include <hitwidget.h> -KWidgetListbox::KWidgetListbox(QWidget *parent, const char *name) - : QTable(parent, name) +KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) + : TQTable(parent, name) { setNumRows(0); setNumCols(1); @@ -32,12 +32,12 @@ KWidgetListbox::KWidgetListbox(QWidget *parent, const char *name) setTopMargin(0); horizontalHeader()->hide(); verticalHeader()->hide(); - setSelectionMode(QTable::NoSelection); - setFocusStyle(QTable::FollowStyle); + setSelectionMode(TQTable::NoSelection); + setFocusStyle(TQTable::FollowStyle); connect(this, SIGNAL(currentChanged(int, int)), this, SLOT(selectionChanged(int, int))); - setHScrollBarMode(QScrollView::AlwaysOff); - setVScrollBarMode(QScrollView::Auto); + setHScrollBarMode(TQScrollView::AlwaysOff); + setVScrollBarMode(TQScrollView::Auto); } KWidgetListbox::~KWidgetListbox() @@ -52,7 +52,7 @@ void KWidgetListbox::clear() setNumRows(0); } -int KWidgetListbox::insertItem(QWidget* item, int index) +int KWidgetListbox::insertItem(TQWidget* item, int index) { int row; @@ -80,7 +80,7 @@ int KWidgetListbox::insertItem(QWidget* item, int index) return row; } -void KWidgetListbox::adjustSize(QWidget* item) +void KWidgetListbox::adjustSize(TQWidget* item) { item->setMinimumWidth( columnWidth(0) ); item->adjustSize(); @@ -91,7 +91,7 @@ void KWidgetListbox::adjustSize(QWidget* item) setRowHeight(index(item), item->height()); } -void KWidgetListbox::setSelected(QWidget* item) +void KWidgetListbox::setSelected(TQWidget* item) { setSelected(index(item)); } @@ -103,7 +103,7 @@ void KWidgetListbox::selectionChanged(int row, int col) emit selected(row); } -void KWidgetListbox::removeItem(QWidget* item) +void KWidgetListbox::removeItem(TQWidget* item) { removeItem(index(item)); } @@ -124,17 +124,17 @@ int KWidgetListbox::selected() const return currentRow(); } -QWidget* KWidgetListbox::selectedItem() const +TQWidget* KWidgetListbox::selectedItem() const { return item(selected()); } -QWidget* KWidgetListbox::item(int index) const +TQWidget* KWidgetListbox::item(int index) const { return cellWidget(index, 0); } -int KWidgetListbox::index(QWidget* itm) const +int KWidgetListbox::index(TQWidget* itm) const { for(int i = 0; i < numRows(); ++i) if(item(i) == itm) @@ -170,7 +170,7 @@ void KWidgetListbox::updateColors() void KWidgetListbox::setItemColors(int index, bool even) { - QWidget* itm = item(index); + TQWidget* itm = item(index); if (!itm) return; @@ -210,13 +210,13 @@ void KWidgetListbox::showItems(show_callback func, void* data) updateColors(); } -void KWidgetListbox::showEvent(QShowEvent*) +void KWidgetListbox::showEvent(TQShowEvent*) { repaintContents(false); } -void KWidgetListbox::paintCell(QPainter*, int, int, const QRect&, - bool, const QColorGroup&) +void KWidgetListbox::paintCell(TQPainter*, int, int, const TQRect&, + bool, const TQColorGroup&) { } diff --git a/src/kwidgetlistbox.h b/src/kwidgetlistbox.h index eae1fb7..2568588 100644 --- a/src/kwidgetlistbox.h +++ b/src/kwidgetlistbox.h @@ -20,40 +20,40 @@ #ifndef KWIDGETLISTBOX_H #define KWIDGETLISTBOX_H -#include <qtable.h> +#include <ntqtable.h> -typedef bool (*show_callback) (int index, QWidget* widget, void* data); +typedef bool (*show_callback) (int index, TQWidget* widget, void* data); -class KWidgetListbox : public QTable +class KWidgetListbox : public TQTable { Q_OBJECT public: - KWidgetListbox(QWidget *parent = 0, const char *name = 0); + KWidgetListbox(TQWidget *parent = 0, const char *name = 0); ~KWidgetListbox(); - int insertItem(QWidget* item, int index = -1); - void setSelected(QWidget* item); + int insertItem(TQWidget* item, int index = -1); + void setSelected(TQWidget* item); void setSelected(int index); - void removeItem(QWidget* item); + void removeItem(TQWidget* item); void removeItem(int index); void clear(); int selected() const; - QWidget* selectedItem() const; - QWidget* item(int index) const; - int index(QWidget* itm) const; + TQWidget* selectedItem() const; + TQWidget* item(int index) const; + int index(TQWidget* itm) const; uint count() const { return numRows(); }; void showItems(show_callback func = 0, void* data = 0); - void paintCell(QPainter* p, int row, int col, const QRect& cr, - bool selected, const QColorGroup& cg); - void adjustSize(QWidget* item); + void paintCell(TQPainter* p, int row, int col, const TQRect& cr, + bool selected, const TQColorGroup& cg); + void adjustSize(TQWidget* item); protected: void setItemColors(int index, bool even); void updateColors(); bool even(int index); - virtual void showEvent(QShowEvent* e); + virtual void showEvent(TQShowEvent* e); protected slots: void selectionChanged(int row, int col); diff --git a/src/likeback.cpp b/src/likeback.cpp index e8cadf4..aade7ca 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -27,24 +27,24 @@ #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> -#include <qlayout.h> -#include <qtoolbutton.h> +#include <ntqlayout.h> +#include <ntqtoolbutton.h> #include <kpushbutton.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qvgroupbox.h> +#include <ntqcheckbox.h> +#include <ntqradiobutton.h> +#include <ntqbuttongroup.h> +#include <ntqvgroupbox.h> #include <kguiitem.h> -#include <qpopupmenu.h> -#include <qtextedit.h> -#include <qlayout.h> -#include <qlabel.h> +#include <ntqpopupmenu.h> +#include <ntqtextedit.h> +#include <ntqlayout.h> +#include <ntqlabel.h> #include <kdialogbase.h> -#include <qhttp.h> +#include <ntqhttp.h> #include <kurl.h> #include <kinputdialog.h> -#include <qvalidator.h> -#include <qaction.h> +#include <ntqvalidator.h> +#include <ntqaction.h> #include <kdebug.h> #include <pwd.h> @@ -60,38 +60,38 @@ /****************************************/ LikeBackBar::LikeBackBar(LikeBack *likeBack) - : QWidget(0, "LikeBackBar", Qt::WX11BypassWM | Qt::WStyle_NoBorder | Qt::WNoAutoErase | Qt::WStyle_StaysOnTop | Qt::WStyle_NoBorder | Qt::Qt::WGroupLeader) + : TQWidget(0, "LikeBackBar", TQt::WX11BypassWM | TQt::WStyle_NoBorder | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop | TQt::WStyle_NoBorder | TQt::TQt::WGroupLeader) , m_likeBack(likeBack) { - QHBoxLayout *layout = new QHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); - QIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like_tork", KIcon::Small); - QIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", KIcon::Small); - QIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug_tork", KIcon::Small); - QIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", KIcon::Small); + TQIconSet likeIconSet = kapp->iconLoader()->loadIconSet("likeback_like_tork", KIcon::Small); + TQIconSet dislikeIconSet = kapp->iconLoader()->loadIconSet("likeback_dislike_tork", KIcon::Small); + TQIconSet bugIconSet = kapp->iconLoader()->loadIconSet("likeback_bug_tork", KIcon::Small); + TQIconSet featureIconSet = kapp->iconLoader()->loadIconSet("likeback_feature_tork", KIcon::Small); - m_likeButton = new QToolButton(this, "likeback_like_tork"); + m_likeButton = new TQToolButton(this, "likeback_like_tork"); m_likeButton->setIconSet(likeIconSet); m_likeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you like")); m_likeButton->setAutoRaise(true); connect( m_likeButton, SIGNAL(clicked()), this, SLOT(clickedLike()) ); layout->add(m_likeButton); - m_dislikeButton = new QToolButton(this, "likeback_dislike_tork"); + m_dislikeButton = new TQToolButton(this, "likeback_dislike_tork"); m_dislikeButton->setIconSet(dislikeIconSet); m_dislikeButton->setTextLabel("<p>" + i18n("Send application developers a comment about something you dislike")); m_dislikeButton->setAutoRaise(true); connect( m_dislikeButton, SIGNAL(clicked()), this, SLOT(clickedDislike()) ); layout->add(m_dislikeButton); - m_bugButton = new QToolButton(this, "likeback_bug_tork"); + m_bugButton = new TQToolButton(this, "likeback_bug_tork"); m_bugButton->setIconSet(bugIconSet); m_bugButton->setTextLabel("<p>" + i18n("Send application developers a comment about an improper behavior of the application")); m_bugButton->setAutoRaise(true); connect( m_bugButton, SIGNAL(clicked()), this, SLOT(clickedBug()) ); layout->add(m_bugButton); - m_featureButton = new QToolButton(this, "likeback_feature_tork"); + m_featureButton = new TQToolButton(this, "likeback_feature_tork"); m_featureButton->setIconSet(featureIconSet); m_featureButton->setTextLabel("<p>" + i18n("Send application developers a comment about a new feature you desire")); m_featureButton->setAutoRaise(true); @@ -123,20 +123,20 @@ void LikeBackBar::stopTimer() void LikeBackBar::autoMove() { - static QWidget *lastWindow = 0; + static TQWidget *lastWindow = 0; - QWidget *window = kapp->activeWindow(); - // When a Kicker applet has the focus, like the Commandline QLineEdit, + TQWidget *window = kapp->activeWindow(); + // When a Kicker applet has the focus, like the Commandline TQLineEdit, // the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon. // It's obviously bad ;-) : bool shouldShow = (m_likeBack->userWantsToShowBar() && m_likeBack->enabledBar() && window && !window->inherits("KSystemTray")); if (shouldShow) { //move(window->x() + window->width() - 100 - width(), window->y()); - //move(window->x() + window->width() - 100 - width(), window->mapToGlobal(QPoint(0, 0)).y() - height()); - move(window->mapToGlobal(QPoint(0, 0)).x() + window->width() - width(), window->mapToGlobal(QPoint(0, 0)).y() + 1); + //move(window->x() + window->width() - 100 - width(), window->mapToGlobal(TQPoint(0, 0)).y() - height()); + move(window->mapToGlobal(TQPoint(0, 0)).x() + window->width() - width(), window->mapToGlobal(TQPoint(0, 0)).y() + 1); if (window != lastWindow && m_likeBack->windowNamesListing() != LikeBack::NoListing) { - if (qstricmp(window->name(), "") == 0 || qstricmp(window->name(), "unnamed") == 0) { + if (tqstricmp(window->name(), "") == 0 || tqstricmp(window->name(), "unnamed") == 0) { std::cout << "===== LikeBack ===== UNNAMED ACTIVE WINDOW OF TYPE " << window->className() << " ======" << LikeBack::activeWindowPath() << std::endl; } else if (m_likeBack->windowNamesListing() == LikeBack::AllWindows) { std::cout << "LikeBack: Active Window: " << LikeBack::activeWindowPath() << std::endl; @@ -209,7 +209,7 @@ LikeBackPrivate::~LikeBackPrivate() /*************************************/ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const KAboutData *aboutData) - : QObject() + : TQObject() { // Initialize properties (1/2): d = new LikeBackPrivate(); @@ -244,7 +244,7 @@ LikeBack::LikeBack(Button buttons, bool showBarByDefault, KConfig *config, const // Show the bar if that's wanted by the developer or the user: if (d->showBar) - QTimer::singleShot( 0, d->bar, SLOT(startTimer()) ); + TQTimer::singleShot( 0, d->bar, SLOT(startTimer()) ); #if 0 disableBar(); @@ -284,40 +284,40 @@ LikeBack::WindowListing LikeBack::windowNamesListing() return d->windowListing; } -void LikeBack::setAcceptedLanguages(const QStringList &locales, const QString &message) +void LikeBack::setAcceptedLanguages(const TQStringList &locales, const TQString &message) { d->acceptedLocales = locales; d->acceptedLanguagesMessage = message; } -QStringList LikeBack::acceptedLocales() +TQStringList LikeBack::acceptedLocales() { return d->acceptedLocales; } -QString LikeBack::acceptedLanguagesMessage() +TQString LikeBack::acceptedLanguagesMessage() { return d->acceptedLanguagesMessage; } -void LikeBack::setServer(const QString &hostName, const QString &remotePath, Q_UINT16 hostPort) +void LikeBack::setServer(const TQString &hostName, const TQString &remotePath, TQ_UINT16 hostPort) { d->hostName = hostName; d->remotePath = remotePath; d->hostPort = hostPort; } -QString LikeBack::hostName() +TQString LikeBack::hostName() { return d->hostName; } -QString LikeBack::remotePath() +TQString LikeBack::remotePath() { return d->remotePath; } -Q_UINT16 LikeBack::hostPort() +TQ_UINT16 LikeBack::hostPort() { return d->hostPort; } @@ -346,7 +346,7 @@ bool LikeBack::enabledBar() return d->disabledCount <= 0; } -void LikeBack::execCommentDialog(Button type, const QString &initialComment, const QString &windowPath, const QString &context) +void LikeBack::execCommentDialog(Button type, const TQString &initialComment, const TQString &windowPath, const TQString &context) { disableBar(); LikeBackDialog dialog(type, initialComment, windowPath, context, this); @@ -412,14 +412,14 @@ void LikeBack::setUserWantsToShowBar(bool showBar) void LikeBack::showInformationMessage() { // Load and register the images needed by the message: - QPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::Small); - QPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::Small); - QPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::Small); - QPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::Small); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon); - QMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_feature", featureIcon); + TQPixmap likeIcon = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::Small); + TQPixmap dislikeIcon = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::Small); + TQPixmap bugIcon = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::Small); + TQPixmap featureIcon = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::Small); + TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_like", likeIcon); + TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_dislike", dislikeIcon); + TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_bug", bugIcon); + TQMimeSourceFactory::defaultFactory()->setPixmap("likeback_icon_feature", featureIcon); // Show a message reflecting the allowed types of comment: Button buttons = d->buttons; @@ -447,7 +447,7 @@ void LikeBack::showInformationMessage() "please click the frowning face below the window title-bar, " "briefly describe what you dislike and click Send.") : - QString() + TQString() ))) + "</p>" + (buttons & LikeBack::Bug ? "<p>" + @@ -481,33 +481,33 @@ void LikeBack::showInformationMessage() i18n("Help Improve the Application")); // Reset the images from the factory: - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_like", 0L); - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_dislike", 0L); - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_bug", 0L); - QMimeSourceFactory::defaultFactory()->setData("likeback_icon_feature", 0L); + TQMimeSourceFactory::defaultFactory()->setData("likeback_icon_like", 0L); + TQMimeSourceFactory::defaultFactory()->setData("likeback_icon_dislike", 0L); + TQMimeSourceFactory::defaultFactory()->setData("likeback_icon_bug", 0L); + TQMimeSourceFactory::defaultFactory()->setData("likeback_icon_feature", 0L); } -QString LikeBack::activeWindowPath() +TQString LikeBack::activeWindowPath() { // Compute the window hierarchy (from the latest to the oldest): - QStringList windowNames; - QWidget *window = kapp->activeWindow(); + TQStringList windowNames; + TQWidget *window = kapp->activeWindow(); while (window) { - QString name = window->name(); + TQString name = window->name(); // Append the class name to the window name if it is unnamed: if (name == "unnamed") - name += QString(":") + window->className(); + name += TQString(":") + window->className(); windowNames.append(name); - window = dynamic_cast<QWidget*>(window->parent()); + window = dynamic_cast<TQWidget*>(window->parent()); } // Create the string of windows starting by the end (from the oldest to the latest): - QString windowPath; + TQString windowPath; for (int i = ((int)windowNames.count()) - 1; i >= 0; i--) { if (windowPath.isEmpty()) windowPath = windowNames[i]; else - windowPath += QString("~~") + windowNames[i]; + windowPath += TQString("~~") + windowNames[i]; } // Finally return the computed path: @@ -520,7 +520,7 @@ bool LikeBack::emailAddressAlreadyProvided() return d->config->readBoolEntry("emailAlreadyAsked", false); } -QString LikeBack::emailAddress() +TQString LikeBack::emailAddress() { if (!emailAddressAlreadyProvided()) askEmailAddress(); @@ -529,7 +529,7 @@ QString LikeBack::emailAddress() return d->config->readEntry("emailAddress", ""); } -void LikeBack::setEmailAddress(const QString &address, bool userProvided) +void LikeBack::setEmailAddress(const TQString &address, bool userProvided) { d->config->setGroup("LikeBack"); d->config->writeEntry("emailAddress", address); @@ -541,20 +541,20 @@ void LikeBack::askEmailAddress() { d->config->setGroup("LikeBack"); - QString currentEmailAddress = d->config->readEntry("emailAddress", ""); + TQString currentEmailAddress = d->config->readEntry("emailAddress", ""); if (!emailAddressAlreadyProvided() && !d->fetchedEmail.isEmpty()) currentEmailAddress = d->fetchedEmail; bool ok; - QString emailExpString = "[\\w-\\.]+@[\\w-\\.]+\\.[\\w]+"; - //QString namedEmailExpString = "[.]*[ \\t]+<" + emailExpString + '>'; - //QRegExp emailExp("^(|" + emailExpString + '|' + namedEmailExpString + ")$"); - QRegExp emailExp("^(|" + emailExpString + ")$"); - QRegExpValidator emailValidator(emailExp, this); + TQString emailExpString = "[\\w-\\.]+@[\\w-\\.]+\\.[\\w]+"; + //TQString namedEmailExpString = "[.]*[ \\t]+<" + emailExpString + '>'; + //TQRegExp emailExp("^(|" + emailExpString + '|' + namedEmailExpString + ")$"); + TQRegExp emailExp("^(|" + emailExpString + ")$"); + TQRegExpValidator emailValidator(emailExp, this); disableBar(); - QString email = KInputDialog::getText( + TQString email = KInputDialog::getText( i18n("Email Address"), "<p><b>" + i18n("Please provide your email address.") + "</b></p>" + "<p>" + i18n("It will only be used to contact you back if more information is needed about your comments, ask you how to reproduce the bugs you report, send bug corrections for you to test, etc.") + "</p>" + @@ -567,7 +567,7 @@ void LikeBack::askEmailAddress() } // FIXME: Should be moved to KAboutData? Cigogne will also need it. -bool LikeBack::isDevelopmentVersion(const QString &version) +bool LikeBack::isDevelopmentVersion(const TQString &version) { return version.find("alpha", /*index=*/0, /*caseSensitive=*/false) != -1 || version.find("beta", /*index=*/0, /*caseSensitive=*/false) != -1 || @@ -584,7 +584,7 @@ bool LikeBack::isDevelopmentVersion(const QString &version) if (m_process) return; m_process = new KProcess(); - *m_process << QString::fromLatin1("kcmshell") << QString::fromLatin1("kcm_useraccount"); + *m_process << TQString::fromLatin1("kcmshell") << TQString::fromLatin1("kcm_useraccount"); connect( m_process, SIGNAL(processExited(KProcess*)), SLOT(fetchUserEmail()) ); if (!m_process->start()) { kdDebug() << "Couldn't start kcmshell.." << endl; @@ -605,23 +605,23 @@ void LikeBack::fetchUserEmail() // m_configureEmail->setEnabled(true); // ### KDE4: why oh why is KEmailSettings in kio? - KConfig emailConf( QString::fromLatin1("emaildefaults") ); + KConfig emailConf( TQString::fromLatin1("emaildefaults") ); // find out the default profile - emailConf.setGroup(QString::fromLatin1("Defaults")); - QString profile = QString::fromLatin1("PROFILE_"); - profile += emailConf.readEntry(QString::fromLatin1("Profile"), QString::fromLatin1("Default")); + emailConf.setGroup(TQString::fromLatin1("Defaults")); + TQString profile = TQString::fromLatin1("PROFILE_"); + profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default")); emailConf.setGroup(profile); - QString fromaddr = emailConf.readEntry(QString::fromLatin1("EmailAddress")); + TQString fromaddr = emailConf.readEntry(TQString::fromLatin1("EmailAddress")); if (fromaddr.isEmpty()) { struct passwd *p; p = getpwuid(getuid()); - d->fetchedEmail = QString::fromLatin1(p->pw_name); + d->fetchedEmail = TQString::fromLatin1(p->pw_name); } else { - QString name = emailConf.readEntry(QString::fromLatin1("FullName")); + TQString name = emailConf.readEntry(TQString::fromLatin1("FullName")); if (!name.isEmpty()) - d->fetchedEmail = /*name + QString::fromLatin1(" <") +*/ fromaddr /*+ QString::fromLatin1(">")*/; + d->fetchedEmail = /*name + TQString::fromLatin1(" <") +*/ fromaddr /*+ TQString::fromLatin1(">")*/; } // m_from->setText( fromaddr ); } @@ -630,7 +630,7 @@ void LikeBack::fetchUserEmail() /********** class LikeBackDialog: **********/ /*******************************************/ -LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialComment, const QString &windowPath, const QString &context, LikeBack *likeBack) +LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const TQString &initialComment, const TQString &windowPath, const TQString &context, LikeBack *likeBack) : KDialogBase(KDialogBase::Swallow, i18n("Send a Comment to Developers"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Default, KDialogBase::Ok, kapp->activeWindow(), /*name=*/"_likeback_feedback_window_", /*modal=*/true, /*separator=*/true) , m_likeBack(likeBack) @@ -652,57 +652,57 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialCo if (m_windowPath.isEmpty()) m_windowPath = LikeBack::activeWindowPath(); - QWidget *page = new QWidget(this); - QVBoxLayout *pageLayout = new QVBoxLayout(page, /*margin=*/0, spacingHint()); + TQWidget *page = new TQWidget(this); + TQVBoxLayout *pageLayout = new TQVBoxLayout(page, /*margin=*/0, spacingHint()); // The introduction message: - QLabel *introduction = new QLabel(introductionText(), page); + TQLabel *introduction = new TQLabel(introductionText(), page); pageLayout->addWidget(introduction); // The comment group: - m_group = new QButtonGroup(0);//i18n("Send Application Developers a Comment About:"), page); - QVGroupBox *box = new QVGroupBox(i18n("Send Application Developers a Comment About:"), page); + m_group = new TQButtonGroup(0);//i18n("Send Application Developers a Comment About:"), page); + TQVGroupBox *box = new TQVGroupBox(i18n("Send Application Developers a Comment About:"), page); pageLayout->addWidget(box); // The radio buttons: - QWidget *buttons = new QWidget(box); - QGridLayout *buttonsGrid = new QGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint()); + TQWidget *buttons = new TQWidget(box); + TQGridLayout *buttonsGrid = new TQGridLayout(buttons, /*nbRows=*/4, /*nbColumns=*/2, /*margin=*/0, spacingHint()); if (m_likeBack->buttons() & LikeBack::Like) { - QPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); - QLabel *likeIcon = new QLabel(buttons); + TQPixmap likePixmap = kapp->iconLoader()->loadIcon("likeback_like_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); + TQLabel *likeIcon = new TQLabel(buttons); likeIcon->setPixmap(likePixmap); - likeIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - QRadioButton *likeButton = new QRadioButton(i18n("Something you &like"), buttons); + likeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + TQRadioButton *likeButton = new TQRadioButton(i18n("Something you &like"), buttons); buttonsGrid->addWidget(likeIcon, /*row=*/0, /*column=*/0); buttonsGrid->addWidget(likeButton, /*row=*/0, /*column=*/1); m_group->insert(likeButton, LikeBack::Like); } if (m_likeBack->buttons() & LikeBack::Dislike) { - QPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); - QLabel *dislikeIcon = new QLabel(buttons); + TQPixmap dislikePixmap = kapp->iconLoader()->loadIcon("likeback_dislike_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); + TQLabel *dislikeIcon = new TQLabel(buttons); dislikeIcon->setPixmap(dislikePixmap); - dislikeIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - QRadioButton *dislikeButton = new QRadioButton(i18n("Something you &dislike"), buttons); + dislikeIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + TQRadioButton *dislikeButton = new TQRadioButton(i18n("Something you &dislike"), buttons); buttonsGrid->addWidget(dislikeIcon, /*row=*/1, /*column=*/0); buttonsGrid->addWidget(dislikeButton, /*row=*/1, /*column=*/1); m_group->insert(dislikeButton, LikeBack::Dislike); } if (m_likeBack->buttons() & LikeBack::Bug) { - QPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); - QLabel *bugIcon = new QLabel(buttons); + TQPixmap bugPixmap = kapp->iconLoader()->loadIcon("likeback_bug_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); + TQLabel *bugIcon = new TQLabel(buttons); bugIcon->setPixmap(bugPixmap); - bugIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - QRadioButton *bugButton = new QRadioButton(i18n("An improper &behavior of this application"), buttons); + bugIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + TQRadioButton *bugButton = new TQRadioButton(i18n("An improper &behavior of this application"), buttons); buttonsGrid->addWidget(bugIcon, /*row=*/2, /*column=*/0); buttonsGrid->addWidget(bugButton, /*row=*/2, /*column=*/1); m_group->insert(bugButton, LikeBack::Bug); } if (m_likeBack->buttons() & LikeBack::Feature) { - QPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); - QLabel *featureIcon = new QLabel(buttons); + TQPixmap featurePixmap = kapp->iconLoader()->loadIcon("likeback_feature_tork", KIcon::NoGroup, 16, KIcon::DefaultState, 0L, true); + TQLabel *featureIcon = new TQLabel(buttons); featureIcon->setPixmap(featurePixmap); - featureIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - QRadioButton *featureButton = new QRadioButton(i18n("A new &feature you desire"), buttons); + featureIcon->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + TQRadioButton *featureButton = new TQRadioButton(i18n("A new &feature you desire"), buttons); buttonsGrid->addWidget(featureIcon, /*row=*/3, /*column=*/0); buttonsGrid->addWidget(featureButton, /*row=*/3, /*column=*/1); m_group->insert(featureButton, LikeBack::Feature); @@ -710,12 +710,12 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialCo m_group->setButton(reason); // The comment text box: - m_comment = new QTextEdit(box); + m_comment = new TQTextEdit(box); m_comment->setTabChangesFocus(true); - m_comment->setTextFormat(QTextEdit::PlainText); + m_comment->setTextFormat(TQTextEdit::PlainText); m_comment->setText(initialComment); - m_showButtons = new QCheckBox(i18n("Show comment buttons below &window titlebars"), page); + m_showButtons = new TQCheckBox(i18n("Show comment buttons below &window titlebars"), page); m_showButtons->setChecked(m_likeBack->userWantsToShowBar()); pageLayout->addWidget(m_showButtons); connect( m_showButtons, SIGNAL(stateChanged(int)), this, SLOT(changeButtonBarVisible()) ); @@ -726,10 +726,10 @@ LikeBackDialog::LikeBackDialog(LikeBack::Button reason, const QString &initialCo setButtonGuiItem(Default, KGuiItem(i18n("&Email Address..."), "mail_generic")); - resize(QSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint())); + resize(TQSize(kapp->desktop()->width() * 1 / 2, kapp->desktop()->height() * 3 / 5).expandedTo(sizeHint())); - QAction *sendShortcut = new QAction(this); - sendShortcut->setAccel(QString("Ctrl+Return")); + TQAction *sendShortcut = new TQAction(this); + sendShortcut->setAccel(TQString("Ctrl+Return")); connect( sendShortcut, SIGNAL(activated()), actionButton(Ok), SLOT(animateClick()) ); setMainWidget(page); @@ -739,16 +739,16 @@ LikeBackDialog::~LikeBackDialog() { } -QString LikeBackDialog::introductionText() +TQString LikeBackDialog::introductionText() { - QString text = "<p>" + i18n("Please provide a brief description of your opinion of %1.").arg(m_likeBack->aboutData()->programName()) + " "; + TQString text = "<p>" + i18n("Please provide a brief description of your opinion of %1.").arg(m_likeBack->aboutData()->programName()) + " "; - QString languagesMessage = ""; + TQString languagesMessage = ""; if (!m_likeBack->acceptedLocales().isEmpty() && !m_likeBack->acceptedLanguagesMessage().isEmpty()) { languagesMessage = m_likeBack->acceptedLanguagesMessage(); - QStringList locales = m_likeBack->acceptedLocales(); - for (QStringList::Iterator it = locales.begin(); it != locales.end(); ++it) { - QString locale = *it; + TQStringList locales = m_likeBack->acceptedLocales(); + for (TQStringList::Iterator it = locales.begin(); it != locales.end(); ++it) { + TQString locale = *it; if (KGlobal::locale()->language().startsWith(locale)) languagesMessage = ""; } @@ -797,17 +797,17 @@ void LikeBackDialog::changeButtonBarVisible() void LikeBackDialog::commentChanged() { - QPushButton *sendButton = actionButton(Ok); + TQPushButton *sendButton = actionButton(Ok); sendButton->setEnabled(!m_comment->text().isEmpty()); } void LikeBackDialog::send() { - QString emailAddress = m_likeBack->emailAddress(); + TQString emailAddress = m_likeBack->emailAddress(); int reason = m_group->selectedId(); - QString type = (reason == LikeBack::Like ? "Like" : (reason == LikeBack::Dislike ? "Dislike" : (reason == LikeBack::Bug ? "Bug" : "Feature"))); - QString data = + TQString type = (reason == LikeBack::Like ? "Like" : (reason == LikeBack::Dislike ? "Dislike" : (reason == LikeBack::Bug ? "Bug" : "Feature"))); + TQString data = "protocol=" + KURL::encode_string("1.0") + '&' + "type=" + KURL::encode_string(type) + '&' + "version=" + KURL::encode_string(m_likeBack->aboutData()->version()) + '&' + @@ -816,13 +816,13 @@ void LikeBackDialog::send() "context=" + KURL::encode_string(m_context) + '&' + "comment=" + KURL::encode_string(m_comment->text()) + '&' + "email=" + KURL::encode_string(emailAddress); - QHttp *http = new QHttp(m_likeBack->hostName(), m_likeBack->hostPort()); + TQHttp *http = new TQHttp(m_likeBack->hostName(), m_likeBack->hostPort()); std::cout << "http://" << m_likeBack->hostName() << ":" << m_likeBack->hostPort() << m_likeBack->remotePath() << std::endl; std::cout << data << std::endl; connect( http, SIGNAL(requestFinished(int, bool)), this, SLOT(requestFinished(int, bool)) ); - QHttpRequestHeader header("POST", m_likeBack->remotePath()); + TQHttpRequestHeader header("POST", m_likeBack->remotePath()); header.setValue("Host", m_likeBack->hostName()); header.setValue("Content-Type", "application/x-www-form-urlencoded"); http->setHost(m_likeBack->hostName()); diff --git a/src/likeback.h b/src/likeback.h index 4b825a5..e5d383a 100644 --- a/src/likeback.h +++ b/src/likeback.h @@ -21,7 +21,7 @@ #ifndef LIKEBACK_H #define LIKEBACK_H -#include <qobject.h> +#include <ntqobject.h> class KConfig; class KAboutData; @@ -59,7 +59,7 @@ class LikeBackDialog; * // Instanciate the LikeBack system, and show the first-use information dialog if the button-bar is shown: * LikeBack *likeBack = new LikeBack(LikeBack::AllButtons, LikeBack::isDevelopmentVersion(kapp->aboutData->version())); // Show button-bar only in beta-versions * likeBack->setServer("myapp.kde.org", "/likeback/send.php"); - * likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Please write in English or French.")); + * likeBack->setAcceptedLanguages(TQStringList::split(";", "en;fr"), i18n("Please write in English or French.")); * * // Comment the following line once you are sure all your windows have a name: * likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows); @@ -72,7 +72,7 @@ class LikeBackDialog; * @see Visit http://basket.kde.org/likeback.php for more information, screenshots, a tutorial, hints, return of experiences, and to download the server-side developer interface... * @author Sebastien Laout <slaout@linux62.org> */ -class LikeBack : public QObject +class LikeBack : public TQObject { Q_OBJECT public: @@ -160,25 +160,25 @@ class LikeBack : public QObject * Passing an empty list and an empty string to the method will make LikeBack display the default message telling the user only English is accepted. * Example of call you can quickly copy, paste and adapt: * @code - * likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Please write in English or French.")); + * likeBack->setAcceptedLanguages(TQStringList::split(";", "en;fr"), i18n("Please write in English or French.")); * @endcode * @Note During tests, if you do not see the sentence, it is because you are running the application with an "accepted language": do not be surprised ;-) * @param locales The list of locales where the message does not need to be shown. See TODO TODO for a list of available locales for you to choose. * @param message The message to displays to the user to tell him what languages are accepted to write his comments. */ - void setAcceptedLanguages(const QStringList &locales, const QString &message); + void setAcceptedLanguages(const TQStringList &locales, const TQString &message); /** * @Returns The list of accepted locales for the user to write comments. * @see setAcceptedLanguages() */ - QStringList acceptedLocales(); + TQStringList acceptedLocales(); /** * @Returns The message displayed to users who are not running the application in an accepted locale. * @see setAcceptedLanguages() */ - QString acceptedLanguagesMessage(); + TQString acceptedLanguagesMessage(); /** * Set the path where LikeBack should send every comments. @@ -188,25 +188,25 @@ class LikeBack : public QObject * @param remotePath The path to the send script on the server. For instance, "/likeback/send.php". * @param hostPort Optionnal port used to contact the server using the HTTP protocol. By default, it is port 80. */ - void setServer(const QString &hostName, const QString &remotePath, Q_UINT16 hostPort = 80); + void setServer(const TQString &hostName, const TQString &remotePath, TQ_UINT16 hostPort = 80); /** * @Returns The server host name to contact when sending comments. * @see setServer() */ - QString hostName(); + TQString hostName(); /** * @Returns The path to the send script on the server. * @see setServer() */ - QString remotePath(); + TQString remotePath(); /** * @Returns The port used to contact the server using the HTTP protocol. * @see setServer() */ - Q_UINT16 hostPort(); + TQ_UINT16 hostPort(); /** * Get the KAction letting user to show the comment dialog. @@ -226,7 +226,7 @@ class LikeBack : public QObject * Normally, you should not need to call this method since it is used to send the window path. * But if you call execCommentDialog(), you could need to use it. */ - static QString activeWindowPath(); + static TQString activeWindowPath(); /** * @Returns The combination of buttons that are shown in the comment dialog and the button-bar. @@ -284,7 +284,7 @@ class LikeBack : public QObject * is commenting a thing he found/thinked about in a sub-dialog. * @param context Not used for the moment. Will allow more fine-grained application status report. */ - void execCommentDialog(Button type = AllButtons, const QString &initialComment = "", const QString &windowPath = "", const QString &context = ""); + void execCommentDialog(Button type = AllButtons, const TQString &initialComment = "", const TQString &windowPath = "", const TQString &context = ""); /** * Popups the dialog for the user to set his email address. @@ -345,20 +345,20 @@ class LikeBack : public QObject * @Returns The email user address, or ask it to the user if he have not provided or ignored it. * @Returns An empty string if the user cancelled the request dialog. */ - QString emailAddress(); + TQString emailAddress(); /** * Define or re-define the user email address. * LikeBack will not ask it again to the user, unless you set @p userProvided to false. * Then, this call can be considered as setting the default email address, that the user should confirm later. */ - void setEmailAddress(const QString &address, bool userProvided = true); + void setEmailAddress(const TQString &address, bool userProvided = true); /** * @Returns true if @p version is an Alpha, Beta, RC, SVN or CVS version. * You can use this static method in the constructor to enable the button-bar by default only during beta-releases. */ - static bool isDevelopmentVersion(const QString &version); + static bool isDevelopmentVersion(const TQString &version); }; #endif // LIKEBACK_H diff --git a/src/likeback_private.h b/src/likeback_private.h index 37ed60f..d7be942 100644 --- a/src/likeback_private.h +++ b/src/likeback_private.h @@ -22,14 +22,14 @@ #define LIKEBACK_PRIVATE_H #include <kdialogbase.h> -#include <qtimer.h> +#include <ntqtimer.h> #include "likeback.h" -class QToolButton; -class QTextEdit; -class QCheckBox; -class QButtonGroup; +class TQToolButton; +class TQTextEdit; +class TQCheckBox; +class TQButtonGroup; class Kaction; class LikeBackPrivate @@ -41,20 +41,20 @@ class LikeBackPrivate KConfig *config; const KAboutData *aboutData; LikeBack::Button buttons; - QString hostName; - QString remotePath; - Q_UINT16 hostPort; - QStringList acceptedLocales; - QString acceptedLanguagesMessage; + TQString hostName; + TQString remotePath; + TQ_UINT16 hostPort; + TQStringList acceptedLocales; + TQString acceptedLanguagesMessage; LikeBack::WindowListing windowListing; bool showBarByDefault; bool showBar; int disabledCount; - QString fetchedEmail; + TQString fetchedEmail; KAction *action; }; -class LikeBackBar : public QWidget +class LikeBackBar : public TQWidget { Q_OBJECT public: @@ -71,27 +71,27 @@ class LikeBackBar : public QWidget void clickedFeature(); private: LikeBack *m_likeBack; - QTimer m_timer; - QToolButton *m_likeButton; - QToolButton *m_dislikeButton; - QToolButton *m_bugButton; - QToolButton *m_featureButton; + TQTimer m_timer; + TQToolButton *m_likeButton; + TQToolButton *m_dislikeButton; + TQToolButton *m_bugButton; + TQToolButton *m_featureButton; }; class LikeBackDialog : public KDialogBase { Q_OBJECT public: - LikeBackDialog(LikeBack::Button reason, const QString &initialComment, const QString &windowPath, const QString &context, LikeBack *likeBack); + LikeBackDialog(LikeBack::Button reason, const TQString &initialComment, const TQString &windowPath, const TQString &context, LikeBack *likeBack); ~LikeBackDialog(); private: LikeBack *m_likeBack; - QString m_windowPath; - QString m_context; - QButtonGroup *m_group; - QTextEdit *m_comment; - QCheckBox *m_showButtons; - QString introductionText(); + TQString m_windowPath; + TQString m_context; + TQButtonGroup *m_group; + TQTextEdit *m_comment; + TQCheckBox *m_showButtons; + TQString introductionText(); private slots: void polish(); void slotDefault(); diff --git a/src/main.cpp b/src/main.cpp index 8418c61..55dfefd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -88,7 +88,7 @@ int main(int argc, char **argv) //Check for the existence of anonymizable/helper programs first. - QStringList programList; + TQStringList programList; programList << "firefox" << "kopete" << "gaim" << "pidgin" << "opera" << "konversation" << "konsole" << "yakuake" << "xterm" << "konqueror" @@ -100,7 +100,7 @@ int main(int argc, char **argv) if (TorkConfig::user().isEmpty()){ FirstRunWizard wizard; wizard.setCaption( i18n( "First-Run Wizard" )); - if (wizard.exec() == QDialog::Rejected) { + if (wizard.exec() == TQDialog::Rejected) { TorkConfig::setUser(""); return 0; } diff --git a/src/maxmin.ui b/src/maxmin.ui index f925689..db5a6a8 100644 --- a/src/maxmin.ui +++ b/src/maxmin.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MaxMin</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MaxMin</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>MaxMinOptions</cstring> </property> @@ -75,7 +75,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -100,7 +100,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -108,7 +108,7 @@ <string>Largest Chunk of Bandwidth to Allocate In One Go:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4_2_2</cstring> </property> @@ -116,7 +116,7 @@ <string>Max Bandwidth to Advertise:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="4"> + <widget class="TQSpinBox" row="1" column="4"> <property name="name"> <cstring>kcfg_BandwidthBurst</cstring> </property> @@ -133,7 +133,7 @@ <number>20</number> </property> </widget> - <widget class="QSpinBox" row="2" column="4"> + <widget class="TQSpinBox" row="2" column="4"> <property name="name"> <cstring>kcfg_MaxAdvertisedBandwidth</cstring> </property> @@ -147,7 +147,7 @@ <number>10</number> </property> </widget> - <widget class="QSpinBox" row="0" column="4"> + <widget class="TQSpinBox" row="0" column="4"> <property name="name"> <cstring>kcfg_BandwidthRate</cstring> </property> @@ -166,7 +166,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_DefaultMaxMinOptions</cstring> </property> @@ -180,7 +180,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>TimedBandwidth</cstring> </property> @@ -194,7 +194,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="7"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="7"> <column> <property name="text"> <string>From</string> @@ -291,7 +291,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -299,7 +299,7 @@ <string>every</string> </property> </widget> - <widget class="QComboBox" row="1" column="5"> + <widget class="TQComboBox" row="1" column="5"> <item> <property name="text"> <string>Day</string> @@ -344,7 +344,7 @@ <cstring>theDay</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="6"> + <widget class="TQPushButton" row="1" column="6"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -352,7 +352,7 @@ <string>&Use B/W Options Above</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -360,7 +360,7 @@ <string>From</string> </property> </widget> - <widget class="QTimeEdit" row="1" column="1"> + <widget class="TQTimeEdit" row="1" column="1"> <property name="name"> <cstring>theTime</cstring> </property> @@ -374,7 +374,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>kcfg_UseScheduledBandwidth</cstring> </property> @@ -420,9 +420,9 @@ </connection> <connection> <sender>timedBandwidthList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>MaxMin</receiver> - <slot>timedBandwidthList_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>timedBandwidthList_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>kcfg_UseScheduledBandwidth</sender> @@ -449,7 +449,7 @@ <slot>kcfg_BandwidthRate_valueChanged( int newValue )</slot> <slot>kcfg_BandwidthBurst_valueChanged( int newValue )</slot> <slot>pushButton1_clicked()</slot> - <slot>timedBandwidthList_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>timedBandwidthList_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> <slot>kcfg_UseScheduledBandwidth_toggled( bool )</slot> </slots> diff --git a/src/maxmin.ui.h b/src/maxmin.ui.h index 05e0b15..95d8a1e 100644 --- a/src/maxmin.ui.h +++ b/src/maxmin.ui.h @@ -21,19 +21,19 @@ #include "torkconfig.h" #include <klocale.h> #include <kmessagebox.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> void MaxMin::init() { - QStringList bandwidthSlots = TorkConfig::bandwidthSlots(); - for ( QStringList::Iterator it = bandwidthSlots.begin(); it != bandwidthSlots.end(); ++it ) + TQStringList bandwidthSlots = TorkConfig::bandwidthSlots(); + for ( TQStringList::Iterator it = bandwidthSlots.begin(); it != bandwidthSlots.end(); ++it ) { if ((*it).isEmpty()) continue; - new QListViewItem(timedBandwidthList,(*it).section("\n",-5,-5), + new TQListViewItem(timedBandwidthList,(*it).section("\n",-5,-5), (*it).section("\n",-4,-4),(*it).section("\n",-3,-3),(*it).section("\n",-2,-2),(*it).section("\n",-1)); } @@ -82,19 +82,19 @@ void MaxMin::kcfg_BandwidthBurst_valueChanged( int newValue) void MaxMin::pushButton1_clicked() { - QString bwtime = theTime->time().toString(); - QString max = QString("%1").arg(kcfg_BandwidthRate->value()); - QString burst = QString("%1").arg(kcfg_BandwidthBurst->value()); - QString adv = QString("%1").arg(kcfg_MaxAdvertisedBandwidth->value()); + TQString bwtime = theTime->time().toString(); + TQString max = TQString("%1").arg(kcfg_BandwidthRate->value()); + TQString burst = TQString("%1").arg(kcfg_BandwidthBurst->value()); + TQString adv = TQString("%1").arg(kcfg_MaxAdvertisedBandwidth->value()); - new QListViewItem(timedBandwidthList,bwtime,theDay->currentText(),max,burst,adv); + new TQListViewItem(timedBandwidthList,bwtime,theDay->currentText(),max,burst,adv); } -void MaxMin::timedBandwidthList_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void MaxMin::timedBandwidthList_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( timedBandwidthList ); + TQPopupMenu *menu = new TQPopupMenu( timedBandwidthList ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -106,7 +106,7 @@ void MaxMin::timedBandwidthList_contextMenuRequested( QListViewItem *, const QPo void MaxMin::slotDeleteEntry( ) { - QListViewItemIterator it(timedBandwidthList, QListViewItemIterator::Selected); + TQListViewItemIterator it(timedBandwidthList, TQListViewItemIterator::Selected); while ( it.current() ) { if (timedBandwidthList->isSelected( it.current())) delete it.current(); diff --git a/src/mixminion.ui b/src/mixminion.ui index dd23437..d82b2a1 100644 --- a/src/mixminion.ui +++ b/src/mixminion.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MixMinionClient</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MixMinionClient</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Anonymous Email Message</string> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>mailLayout</cstring> </property> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout2_2</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -50,7 +50,7 @@ <string>Subject:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>subject</cstring> </property> @@ -65,7 +65,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout1</cstring> </property> @@ -90,7 +90,7 @@ </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>send</cstring> </property> @@ -108,12 +108,12 @@ </widget> </hbox> </widget> - <widget class="QTextEdit" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQTextEdit" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>messageBody</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout2</cstring> </property> @@ -121,7 +121,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -129,7 +129,7 @@ <string>To:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>toAddress</cstring> </property> diff --git a/src/mixminion.ui.h b/src/mixminion.ui.h index 38ba077..03cf179 100644 --- a/src/mixminion.ui.h +++ b/src/mixminion.ui.h @@ -22,13 +22,13 @@ #include <kmessagebox.h> #include <kprogress.h> #include <kdebug.h> -#include <qregexp.h> -#include <qtimer.h> +#include <ntqregexp.h> +#include <ntqtimer.h> #include "torkconfig.h" #include <cstdlib> KProgressDialog* progressDialog; -QString output; +TQString output; void MixMinionClient::init() { @@ -47,12 +47,12 @@ void MixMinionClient::send_clicked() KProcIO* mixminionproc = new KProcIO(); mixminionproc->setUseShell(TRUE); - QString curpath = (QString) getenv("PATH"); + TQString curpath = (TQString) getenv("PATH"); mixminionproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"); - mixminionproc->setEnvironment("http_proxy",QString("%1:%2").arg(TorkConfig::konqHttpProxy()) + mixminionproc->setEnvironment("http_proxy",TQString("%1:%2").arg(TorkConfig::konqHttpProxy()) .arg(TorkConfig::konqHttpProxyPort())); - mixminionproc->setEnvironment("https_proxy",QString("%1:%2").arg(TorkConfig::konqHttpsProxy()) + mixminionproc->setEnvironment("https_proxy",TQString("%1:%2").arg(TorkConfig::konqHttpsProxy()) .arg(TorkConfig::konqHttpsProxyPort())); *mixminionproc << "printf '" << messageBody->text() <<"' | mixminion send -t " << toAddress->text() @@ -63,7 +63,7 @@ void MixMinionClient::send_clicked() connect( mixminionproc, SIGNAL(readReady(KProcIO *)), SLOT(receivedMixminionOutput(KProcIO *)) ); - progressDialog = new KProgressDialog( this, "progress_dialog", QString::null, "Sending Anonymous Mail Message..", false ); + progressDialog = new KProgressDialog( this, "progress_dialog", TQString::null, "Sending Anonymous Mail Message..", false ); progressDialog->setPlainCaption( i18n( "Sending Anonymous Mail Message.." ) ); @@ -72,7 +72,7 @@ void MixMinionClient::send_clicked() progressDialog->setMinimumDuration( 500 ); progressDialog->show(); - QTimer* timer = new QTimer( this ); + TQTimer* timer = new TQTimer( this ); connect( timer, SIGNAL( timeout() ), this, SLOT( slotProg() ) ); timer->start( 200, FALSE ); @@ -92,9 +92,9 @@ void MixMinionClient::receivedMixminionOutput(KProcIO *mixminionproc) { int pos; - QString item2; + TQString item2; while ((mixminionproc) && ((pos = (mixminionproc->readln(item2,true))) != -1)) { - item2.replace(QRegExp("^[^#]+\\]"),""); + item2.replace(TQRegExp("^[^#]+\\]"),""); progressDialog->setLabel( item2.stripWhiteSpace()); progressDialog->progressBar()->setProgress(progressDialog->progressBar()->progress() + 4 ); output += item2; @@ -106,8 +106,8 @@ void MixMinionClient::receivedMixminionOutput(KProcIO *mixminionproc) void MixMinionClient::mixminionprocExited(KProcess *proc) { - QString caption; - QString message; + TQString caption; + TQString message; delete progressDialog; progressDialog = 0; diff --git a/src/newfirstrunwizard.ui b/src/newfirstrunwizard.ui index 259decf..f383740 100644 --- a/src/newfirstrunwizard.ui +++ b/src/newfirstrunwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FirstRunWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>FirstRunWizard</cstring> </property> @@ -21,7 +21,7 @@ <bold>1</bold> </font> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>OpeningPage</cstring> </property> @@ -48,7 +48,7 @@ <p>This wizard will help you setup TorK in a couple of simple steps. Click <i>Next</i> to begin.</p></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -86,7 +86,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>LocalOrRemote</cstring> </property> @@ -114,7 +114,7 @@ </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3_3</cstring> </property> @@ -149,7 +149,7 @@ <enum>AtWordBoundary</enum> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1_2_2</cstring> </property> @@ -160,7 +160,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>monitorLocal</cstring> </property> @@ -174,7 +174,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>monitorRemote</cstring> </property> @@ -189,7 +189,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2</cstring> </property> @@ -210,7 +210,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Locate_Tor</cstring> </property> @@ -238,7 +238,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_2</cstring> </property> @@ -257,7 +257,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion</cstring> </property> @@ -268,7 +268,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout2</cstring> </property> @@ -284,7 +284,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -317,7 +317,7 @@ <enum>AtWordBoundary</enum> </property> </widget> - <widget class="QToolButton" row="1" column="1"> + <widget class="TQToolButton" row="1" column="1"> <property name="name"> <cstring>downloadTor</cstring> </property> @@ -351,7 +351,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>HowDoesTorStart</cstring> </property> @@ -362,7 +362,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2</cstring> </property> @@ -373,7 +373,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout2_2</cstring> </property> @@ -389,7 +389,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_5</cstring> </property> @@ -399,7 +399,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>How</cstring> </property> @@ -410,7 +410,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>torStartsAutomatically</cstring> </property> @@ -424,7 +424,7 @@ <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>torStartsManually</cstring> </property> @@ -503,7 +503,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_3</cstring> </property> @@ -524,7 +524,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TorUsage</cstring> </property> @@ -535,7 +535,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_2</cstring> </property> @@ -546,7 +546,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel9_3_2</cstring> </property> @@ -555,7 +555,7 @@ <p>TorK can run Tor in a variety of different modes. Choose one from the list below.</p></string> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <item> <property name="text"> <string>Run a Tor Client and Server With Default Settings</string> @@ -590,7 +590,7 @@ <cstring>WizardQuickConfigure</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>settingsDescription</cstring> </property> @@ -617,7 +617,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_4</cstring> </property> @@ -638,7 +638,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Remote_Tor</cstring> </property> @@ -649,7 +649,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>groupBox28</cstring> </property> @@ -660,7 +660,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2_2_2_4</cstring> </property> @@ -668,7 +668,7 @@ <string>:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>TorPassword</cstring> </property> @@ -676,7 +676,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_4_2_3</cstring> </property> @@ -684,7 +684,7 @@ <string>Address/ Port of Tor Instance:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>RemoteTorAddress</cstring> </property> @@ -695,7 +695,7 @@ <string>127.0.0.1</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>RemoteTorPort</cstring> </property> @@ -715,7 +715,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -723,7 +723,7 @@ <string>Tor Password (if needed):</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel9_3_2_4</cstring> </property> @@ -751,7 +751,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_5</cstring> </property> @@ -772,7 +772,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TorServer</cstring> </property> @@ -783,7 +783,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>groupBox28_2</cstring> </property> @@ -794,7 +794,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel9_2_2_3</cstring> </property> @@ -802,7 +802,7 @@ <string><p> The information below will be used to identify your Tor server <b>You can change this later.</b></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel9_3_2_4_2</cstring> </property> @@ -810,7 +810,7 @@ <string><p>Since you are going to run a Tor server, you need to give it a name and provide your contact info.</p></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>layout8</cstring> </property> @@ -818,7 +818,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_3_3</cstring> </property> @@ -826,12 +826,12 @@ <string>Server Name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>serverName</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2_2_3</cstring> </property> @@ -839,7 +839,7 @@ <string>Contact Email:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>contactMail</cstring> </property> @@ -865,7 +865,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_6</cstring> </property> @@ -886,7 +886,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TestingTor</cstring> </property> @@ -897,7 +897,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Testing_Tor</cstring> </property> @@ -908,7 +908,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>modifyConfigs</cstring> </property> @@ -919,7 +919,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>modifyConfs</cstring> </property> @@ -935,7 +935,7 @@ <cstring>addConfig</cstring> </property> </widget> - <widget class="QListBox" row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <item> <property name="text"> <string>~/.tor/torrc</string> @@ -972,7 +972,7 @@ </widget> </grid> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>testTorAgain</cstring> </property> @@ -980,7 +980,7 @@ <string>Test Tor</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>torControlStatus</cstring> </property> @@ -1018,7 +1018,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_7</cstring> </property> @@ -1039,7 +1039,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>NowForPrivoxy</cstring> </property> @@ -1050,7 +1050,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_2_2</cstring> </property> @@ -1061,7 +1061,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel9_3_2_3</cstring> </property> @@ -1093,7 +1093,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_8</cstring> </property> @@ -1114,7 +1114,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WhichProxy</cstring> </property> @@ -1125,7 +1125,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3</cstring> </property> @@ -1136,7 +1136,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>buttonGroup1_2</cstring> </property> @@ -1147,7 +1147,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>usingAnotherProxy</cstring> </property> @@ -1161,7 +1161,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>usingPrivoxy</cstring> </property> @@ -1240,7 +1240,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_9</cstring> </property> @@ -1261,7 +1261,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Locate_Privoxy</cstring> </property> @@ -1272,7 +1272,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_3</cstring> </property> @@ -1283,7 +1283,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout2_5</cstring> </property> @@ -1299,7 +1299,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_6</cstring> </property> @@ -1331,7 +1331,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <enum>AtWordBoundary</enum> </property> </widget> - <widget class="QToolButton" row="1" column="1"> + <widget class="TQToolButton" row="1" column="1"> <property name="name"> <cstring>downloadPrivoxy</cstring> </property> @@ -1380,7 +1380,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_10</cstring> </property> @@ -1401,7 +1401,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>HowDoesPrivoxyStart</cstring> </property> @@ -1429,7 +1429,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_11</cstring> </property> @@ -1448,7 +1448,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_4</cstring> </property> @@ -1459,7 +1459,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layout2_2_2</cstring> </property> @@ -1475,7 +1475,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <number>1</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_5_2</cstring> </property> @@ -1507,7 +1507,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <enum>AtWordBoundary</enum> </property> </widget> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>buttonGroup1_3</cstring> </property> @@ -1518,7 +1518,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>privoxyStartsAutomatically</cstring> </property> @@ -1532,7 +1532,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>privoxyStartsManually</cstring> </property> @@ -1574,7 +1574,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>PrivoxyConfiguration</cstring> </property> @@ -1585,7 +1585,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>Testing_Tor_2</cstring> </property> @@ -1596,7 +1596,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1"> + <widget class="TQGroupBox" row="0" column="1"> <property name="name"> <cstring>modifyConfigs_2</cstring> </property> @@ -1607,7 +1607,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>modifyConfPrivoxy</cstring> </property> @@ -1623,7 +1623,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <cstring>addConfig_2</cstring> </property> </widget> - <widget class="QListBox" row="0" column="0"> + <widget class="TQListBox" row="0" column="0"> <item> <property name="text"> <string>/etc/privoxy/config</string> @@ -1645,7 +1645,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>privoxyStatus</cstring> </property> @@ -1674,7 +1674,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>CheckUsing</cstring> </property> @@ -1685,7 +1685,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3_2_2</cstring> </property> @@ -1696,7 +1696,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pushButton1_2</cstring> </property> @@ -1747,7 +1747,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_12</cstring> </property> @@ -1768,7 +1768,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>CheckNotUsing</cstring> </property> @@ -1779,7 +1779,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3_2</cstring> </property> @@ -1819,7 +1819,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <enum>AtWordBoundary</enum> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -1849,7 +1849,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_13</cstring> </property> @@ -1870,7 +1870,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>NonPrivoxyConfirmation</cstring> </property> @@ -1881,7 +1881,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3_2_2_2_2_2</cstring> </property> @@ -1892,7 +1892,7 @@ to talk to Tor and cleans out a lot of revealing junk from your browser's reques <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2_2_2_2_2_2_2_2</cstring> </property> @@ -1943,7 +1943,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_14</cstring> </property> @@ -1964,7 +1964,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>FinalPrivoxy</cstring> </property> @@ -1975,7 +1975,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3_2_2_2</cstring> </property> @@ -1986,7 +1986,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2_2_2_2_2_2</cstring> </property> @@ -1994,7 +1994,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <string>:</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pushButton1_3</cstring> </property> @@ -2047,7 +2047,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_15</cstring> </property> @@ -2068,7 +2068,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>PrivoxyConfirmation</cstring> </property> @@ -2079,7 +2079,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQGroupBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>Tor_Installtion_2_3_2_2_2_2_3</cstring> </property> @@ -2133,7 +2133,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2_16</cstring> </property> @@ -2154,7 +2154,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Netstat</cstring> </property> @@ -2165,7 +2165,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>Tor_Installtion_2_3_2_2_2_2_3_2</cstring> </property> @@ -2193,7 +2193,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </size> </property> </spacer> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>pushButton6</cstring> </property> @@ -2280,7 +2280,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Final</cstring> </property> @@ -2291,7 +2291,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>Tor_Installtion_2_3_2_2_2_2</cstring> </property> @@ -2302,7 +2302,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2_2_2_2_2_2_2</cstring> </property> @@ -2386,9 +2386,9 @@ I've configured your Privacy Proxy. Click next to continue.</string> </connection> <connection> <sender>TorLocation</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>FirstRunWizard</receiver> - <slot>TorLocation_textChanged(const QString&)</slot> + <slot>TorLocation_textChanged(const TQString&)</slot> </connection> <connection> <sender>torStartsAutomatically</sender> @@ -2452,9 +2452,9 @@ I've configured your Privacy Proxy. Click next to continue.</string> </connection> <connection> <sender>RemoteTorAddress</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>FirstRunWizard</receiver> - <slot>RemoteTorAddress_textChanged(const QString&)</slot> + <slot>RemoteTorAddress_textChanged(const TQString&)</slot> </connection> <connection> <sender>modifyConfPrivoxy</sender> @@ -2484,7 +2484,7 @@ I've configured your Privacy Proxy. Click next to continue.</string> <slot>WizardQuickConfigure_activated( int item )</slot> <slot>saveNonAnonymousProxySettings()</slot> <slot>saveAnonymousProxySettings()</slot> - <slot>TorLocation_textChanged( const QString & text )</slot> + <slot>TorLocation_textChanged( const TQString & text )</slot> <slot>pushButton1_clicked()</slot> <slot>pushButton1_2_clicked()</slot> <slot>pushButton1_3_clicked()</slot> @@ -2496,16 +2496,16 @@ I've configured your Privacy Proxy. Click next to continue.</string> <slot>examineConfigFiles()</slot> <slot>pushButton6_clicked()</slot> <slot>rootifyNetstat()</slot> - <slot>sighupTor( const QString & text )</slot> - <slot>appendControlDirective( const QString & text )</slot> - <slot>RemoteTorAddress_textChanged( const QString & text )</slot> + <slot>sighupTor( const TQString & text )</slot> + <slot>appendControlDirective( const TQString & text )</slot> + <slot>RemoteTorAddress_textChanged( const TQString & text )</slot> <slot>modifyConfPrivoxy_clicked()</slot> <slot>examinePrivoxyConfigFiles()</slot> - <slot>appendPrivoxyConfig( const QString & text )</slot> + <slot>appendPrivoxyConfig( const TQString & text )</slot> </slots> <functions> <function access="private" specifier="non virtual">init()</function> - <function access="protected">showPage( QWidget * w )</function> + <function access="protected">showPage( TQWidget * w )</function> <function access="private" specifier="non virtual">guessDataDir()</function> </functions> <layoutdefaults spacing="6" margin="11"/> diff --git a/src/newfirstrunwizard.ui.h b/src/newfirstrunwizard.ui.h index 32d33a4..0480bec 100644 --- a/src/newfirstrunwizard.ui.h +++ b/src/newfirstrunwizard.ui.h @@ -24,9 +24,9 @@ #include "torclient.h" #include <kapplication.h> -#include <qpushbutton.h> -#include <qpixmap.h> -#include <qtimer.h> +#include <ntqpushbutton.h> +#include <ntqpixmap.h> +#include <ntqtimer.h> #include <stdlib.h> #include <kstandarddirs.h> #include <kurl.h> @@ -38,7 +38,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <krun.h> -#include <qvaluevector.h> +#include <ntqvaluevector.h> #include "functions.h" @@ -46,31 +46,31 @@ TorClient* client; KProcIO *whichproc; bool torRunning; bool privoxyRunning; -QString tor; -QString privoxy; -QString netstat; -QString torknetstat; - -QString OriginalHttpProxy; -QString OriginalHttpsProxy; -QString OriginalFtpProxy; -QString OriginalProxyType; - -QString KonqHttpProxy; -QString KonqHttpsProxy; -QString KonqFtpProxy; +TQString tor; +TQString privoxy; +TQString netstat; +TQString torknetstat; + +TQString OriginalHttpProxy; +TQString OriginalHttpsProxy; +TQString OriginalFtpProxy; +TQString OriginalProxyType; + +TQString KonqHttpProxy; +TQString KonqHttpsProxy; +TQString KonqFtpProxy; uint KonqHttpProxyPort; uint KonqHttpsProxyPort; uint KonqFtpProxyPort; -QString OriginalCookies; -QString OriginalUseCache; -QString OriginalSendUserAgent; -QString OriginalEnableJavascript; -QString OriginalEnableJava; -QString OriginalEnablePlugins; +TQString OriginalCookies; +TQString OriginalUseCache; +TQString OriginalSendUserAgent; +TQString OriginalEnableJavascript; +TQString OriginalEnableJava; +TQString OriginalEnablePlugins; -QValueVector<QString> descriptions(6); +TQValueVector<TQString> descriptions(6); void FirstRunWizard::init() @@ -128,13 +128,13 @@ FirstRunWizard::init() serverName->setText("TorKServer"); - KConfig emailConf( QString::fromLatin1("emaildefaults") ); - emailConf.setGroup(QString::fromLatin1("Defaults")); - QString profile = QString::fromLatin1("PROFILE_"); - profile += emailConf.readEntry(QString::fromLatin1("Profile"), QString::fromLatin1("Default")); + KConfig emailConf( TQString::fromLatin1("emaildefaults") ); + emailConf.setGroup(TQString::fromLatin1("Defaults")); + TQString profile = TQString::fromLatin1("PROFILE_"); + profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default")); emailConf.setGroup(profile); - contactMail->setText(emailConf.readEntry(QString::fromLatin1("EmailAddress"))); + contactMail->setText(emailConf.readEntry(TQString::fromLatin1("EmailAddress"))); guessDataDir(); //aesthetics @@ -144,7 +144,7 @@ FirstRunWizard::init() whichproc = new KProcIO(); whichproc->setUseShell(TRUE); - QString whichCommand="ps -C tor;ps -C privoxy"; + TQString whichCommand="ps -C tor;ps -C privoxy"; *whichproc<<whichCommand; @@ -199,7 +199,7 @@ void FirstRunWizard::torStartsManually_toggled( bool state) void FirstRunWizard::processWhich(KProcIO *whichproc) { - QString item = ""; + TQString item = ""; int pos; while ((pos = (whichproc->readln(item,true))) != -1) { @@ -213,9 +213,9 @@ void FirstRunWizard::processWhich(KProcIO *whichproc) } void -FirstRunWizard::showPage( QWidget *w ) //virtual +FirstRunWizard::showPage( TQWidget *w ) //virtual { - QWizard::showPage( w ); + TQWizard::showPage( w ); if (currentPage() == HowDoesTorStart){ @@ -289,7 +289,7 @@ void FirstRunWizard::accept() { - QString paths; + TQString paths; paths = ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"; paths.replace("::",":"); @@ -354,12 +354,12 @@ FirstRunWizard::accept() } TorkConfig::writeConfig(); - QDialog::accept(); + TQDialog::accept(); } void FirstRunWizard::reject() { - QDialog::reject(); + TQDialog::reject(); } void FirstRunWizard::WizardQuickConfigure_activated( int item) @@ -424,7 +424,7 @@ FirstRunWizard::saveAnonymousProxySettings() } -void FirstRunWizard::TorLocation_textChanged( const QString & text) +void FirstRunWizard::TorLocation_textChanged( const TQString & text) { if (text.contains("tor")) setNextEnabled ( Locate_Tor,true ); @@ -460,7 +460,7 @@ void FirstRunWizard::testTorAgain_clicked() void FirstRunWizard::testTor() { kdDebug() << "testing tor" << endl; - QString host; + TQString host; int port; if (monitorRemote->isChecked()){ host = RemoteTorAddress->text(); @@ -557,7 +557,7 @@ void FirstRunWizard::contactedTor() testTorAgain->setEnabled(true); TorkConfig::setGenerateRandomPassword(true); // if (!monitorRemote->isChecked()) -// QTimer::singleShot( 3000, this, SLOT(examineConfigFiles()) ); +// TQTimer::singleShot( 3000, this, SLOT(examineConfigFiles()) ); } @@ -567,7 +567,7 @@ void FirstRunWizard::examineConfigFiles() bool foundone = false; for (unsigned int index = 0; index != configCandidates->count(); ++index){ - if (QFile::exists(configCandidates->item(index)->text())) + if (TQFile::exists(configCandidates->item(index)->text())) { appendControlDirective(configCandidates->item(index)->text()); foundone = true; @@ -596,28 +596,28 @@ void FirstRunWizard::pushButton6_clicked() void FirstRunWizard::rootifyNetstat() { - QString newnetstat = QString(netstat).replace("netstat","torknetstat"); + TQString newnetstat = TQString(netstat).replace("netstat","torknetstat"); KProcIO *catproc = new KProcIO(); catproc->setUseShell(TRUE); - QString whichCommand= QString("kdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat); + TQString whichCommand= TQString("kdesu -t -c 'cp %1 %2;chmod u+s %3'").arg(netstat).arg(newnetstat).arg(newnetstat); *catproc<<whichCommand; catproc->start(KProcIO::NotifyOnExit,TRUE); } -void FirstRunWizard::sighupTor(const QString& text) +void FirstRunWizard::sighupTor(const TQString& text) { KProcIO *catproc = new KProcIO(); catproc->setUseShell(TRUE); - QString whichCommand= QString("killall -s HUP %1").arg(text); + TQString whichCommand= TQString("killall -s HUP %1").arg(text); *catproc<<whichCommand; catproc->start(KProcIO::NotifyOnExit,TRUE); } -void FirstRunWizard::appendControlDirective(const QString& text) +void FirstRunWizard::appendControlDirective(const TQString& text) { int result = KMessageBox::questionYesNo(this, @@ -630,10 +630,10 @@ void FirstRunWizard::appendControlDirective(const QString& text) return; } - QFile inf(text); + TQFile inf(text); if ( inf.open(IO_WriteOnly | IO_Append) ) { - QTextStream ts( &inf ); + TQTextStream ts( &inf ); ts << "ControlPort 9051" << "\n"; @@ -642,10 +642,10 @@ void FirstRunWizard::appendControlDirective(const QString& text) }else{ - QString directory = KURL(text).directory(); + TQString directory = KURL(text).directory(); KProcIO *catproc = new KProcIO(); catproc->setUseShell(TRUE); - QString whichCommand= QString("kdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\"" + TQString whichCommand= TQString("kdesu -c \"sh -c 'mkdir -p %1;printf \\\"ControlPort 9051\\n\\\"" " >> %2;killall -s HUP tor'\"").arg(directory).arg(text); *catproc<<whichCommand; catproc->start(KProcIO::NotifyOnExit,TRUE); @@ -658,12 +658,12 @@ void FirstRunWizard::appendControlDirective(const QString& text) void FirstRunWizard::guessDataDir( ) { - QStringList dataDirCands; - dataDirCands << QString("%1/.tor/").arg(getenv("HOME")); - dataDirCands << QString("/var/lib/tor/"); + TQStringList dataDirCands; + dataDirCands << TQString("%1/.tor/").arg(getenv("HOME")); + dataDirCands << TQString("/var/lib/tor/"); - for ( QStringList::Iterator it = dataDirCands.begin(); it != dataDirCands.end(); ++it ) { - QDir inf((*it)); + for ( TQStringList::Iterator it = dataDirCands.begin(); it != dataDirCands.end(); ++it ) { + TQDir inf((*it)); if ( inf.exists() ) { TorkConfig::setDataDirectory((*it)); return; @@ -672,7 +672,7 @@ void FirstRunWizard::guessDataDir( ) } -void FirstRunWizard::RemoteTorAddress_textChanged( const QString & text) +void FirstRunWizard::RemoteTorAddress_textChanged( const TQString & text) { if ((text == "127.0.0.1") || (text == "localhost")) TorPassword->setEnabled(false); @@ -692,7 +692,7 @@ void FirstRunWizard::examinePrivoxyConfigFiles() bool foundone = false; for (unsigned int index = 0; index != configCandidatesPrivoxy->count(); ++index){ - if (QFile::exists(configCandidatesPrivoxy->item(index)->text())) + if (TQFile::exists(configCandidatesPrivoxy->item(index)->text())) { appendPrivoxyConfig(configCandidatesPrivoxy->item(index)->text()); foundone = true; @@ -712,10 +712,10 @@ void FirstRunWizard::examinePrivoxyConfigFiles() } } -void FirstRunWizard::appendPrivoxyConfig(const QString& text) +void FirstRunWizard::appendPrivoxyConfig(const TQString& text) { - QString privoxyConf = QString( + TQString privoxyConf = TQString( "confdir %1\\n" "logdir .\\n" "listen-address %2:%3\\n" @@ -744,10 +744,10 @@ void FirstRunWizard::appendPrivoxyConfig(const QString& text) return; } - QFile inf(text); + TQFile inf(text); if ( inf.open(IO_WriteOnly | IO_Append) ) { - QTextStream ts( &inf ); + TQTextStream ts( &inf ); ts << privoxyConf; @@ -758,7 +758,7 @@ void FirstRunWizard::appendPrivoxyConfig(const QString& text) KProcIO *catproc = new KProcIO(); catproc->setUseShell(TRUE); - QString whichCommand= QString("kdesu -c \"sh -c 'printf \\\"%1\\\"" + TQString whichCommand= TQString("kdesu -c \"sh -c 'printf \\\"%1\\\"" " >> %2;killall -s HUP privoxy'\"") .arg(privoxyConf) .arg(text); diff --git a/src/newstreamosd.cpp b/src/newstreamosd.cpp index 4ed437c..6c52760 100644 --- a/src/newstreamosd.cpp +++ b/src/newstreamosd.cpp @@ -47,24 +47,24 @@ #include <kconfig.h> #include <klocale.h> #include <kpopupmenu.h> -#include <qlistview.h> -#include <qlayout.h> -#include <qheader.h> - -#include <qpixmap.h> -#include <qpainter.h> -#include <qapplication.h> -#include <qframe.h> -#include <qtoolbutton.h> +#include <ntqlistview.h> +#include <ntqlayout.h> +#include <ntqheader.h> + +#include <ntqpixmap.h> +#include <ntqpainter.h> +#include <ntqapplication.h> +#include <ntqframe.h> +#include <ntqtoolbutton.h> #include <kapplication.h> #include <kiconloader.h> #include <X11/Xlib.h> -#include <qtooltip.h> //QToolTip::palette() +#include <ntqtooltip.h> //TQToolTip::palette() StreamOSD::StreamOSD( torkView* parent, bool tortraffic, const char* name ) - : QWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ), + : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop ), m_dirty(true), m_dragging(false), m_screen(0), @@ -95,7 +95,7 @@ StreamOSD::~StreamOSD() -void StreamOSD::setText( const QString& text ) +void StreamOSD::setText( const TQString& text ) { if( m_text != text ) { m_text = text; @@ -114,7 +114,7 @@ void StreamOSD::setProgress( int p ) } -void StreamOSD::setPosition( const QPoint& p ) +void StreamOSD::setPosition( const TQPoint& p ) { m_position = p; reposition(); @@ -135,53 +135,53 @@ void StreamOSD::refresh() void StreamOSD::renderOSD() { - QColor osdcolor = QToolTip::palette().color(QPalette::Active, QColorGroup::Background); + TQColor osdcolor = TQToolTip::palette().color(TQPalette::Active, TQColorGroup::Background); int large = font().pointSize(); int small = font().pointSize() - 1; - QFont f( font().rawName(), small ); + TQFont f( font().rawName(), small ); setFont( f ); - setWFlags( Qt::WX11BypassWM ); + setWFlags( TQt::WX11BypassWM ); setPalette(osdcolor); setPaletteBackgroundColor(osdcolor); //setBackgroundMode( PaletteBase ); - QGridLayout* TabPageLayout = new QGridLayout( this, 3, 8, 11, 6, "TabPageLayout"); + TQGridLayout* TabPageLayout = new TQGridLayout( this, 3, 8, 11, 6, "TabPageLayout"); TabPageLayout->setMargin(2); - QLabel* textLabel = new QLabel( this, "textLabel2" ); + TQLabel* textLabel = new TQLabel( this, "textLabel2" ); textLabel->setText(i18n("<b>Tor Traffic</b>")); - QFont f2( font().rawName(), large ); + TQFont f2( font().rawName(), large ); textLabel->setFont( f2 ); TabPageLayout->addMultiCellWidget( textLabel, 0,0,0,3 ); - changeID = new QToolButton( this,"changeid" ); + changeID = new TQToolButton( this,"changeid" ); changeID->setIconSet( SmallIconSet( "tork_identity" ) ); changeID->setUsesTextLabel(false); - changeID->setMaximumSize(SmallIconSet( "tork_identity" ).iconSize(QIconSet::Small)); + changeID->setMaximumSize(SmallIconSet( "tork_identity" ).iconSize(TQIconSet::Small)); changeID->adjustSize(); TabPageLayout->addWidget(changeID,0,5); - QToolTip::add( changeID, i18n( "Change the 'Exit' used for current traffic.") ); + TQToolTip::add( changeID, i18n( "Change the 'Exit' used for current traffic.") ); - toggleKDE = new QToolButton( this,"konq" ); + toggleKDE = new TQToolButton( this,"konq" ); toggleKDE->setIconSet( SmallIconSet( "tork_konqueroroff" ) ); toggleKDE->setUsesTextLabel(false); - toggleKDE->setMaximumSize(SmallIconSet( "tork_konqueroroff" ).iconSize(QIconSet::Small)); + toggleKDE->setMaximumSize(SmallIconSet( "tork_konqueroroff" ).iconSize(TQIconSet::Small)); toggleKDE->adjustSize(); TabPageLayout->addWidget(toggleKDE,0,6); - QToolTip::add( toggleKDE,i18n("Enable/Disable Konqueror's use of Tor")); + TQToolTip::add( toggleKDE,i18n("Enable/Disable Konqueror's use of Tor")); - QToolButton* hideMonitor = new QToolButton( this,"hide" ); + TQToolButton* hideMonitor = new TQToolButton( this,"hide" ); hideMonitor->setIconSet( SmallIconSet( "cancel" ) ); /* hideMonitor->setTextLabel(i18n( "Hide" )); - hideMonitor->setTextPosition(QToolButton::Right); + hideMonitor->setTextPosition(TQToolButton::Right); hideMonitor->setUsesTextLabel(true);*/ hideMonitor->setUsesTextLabel(false); - hideMonitor->setMaximumSize(SmallIconSet( "cancel" ).iconSize(QIconSet::Small)); + hideMonitor->setMaximumSize(SmallIconSet( "cancel" ).iconSize(TQIconSet::Small)); hideMonitor->adjustSize(); TabPageLayout->addWidget(hideMonitor,0,7); - QToolTip::add( hideMonitor,i18n("Hide this Display.")); + TQToolTip::add( hideMonitor,i18n("Hide this Display.")); - QToolTip::add( this,i18n("This displays all network activity currently being handled by Tor.")); + TQToolTip::add( this,i18n("This displays all network activity currently being handled by Tor.")); connect( hideMonitor, SIGNAL(clicked()), SLOT(slotHideMonitor()) ); @@ -194,28 +194,28 @@ void StreamOSD::renderOSD() // SLOT(slotToggleKDE()) ); - infoList = new QListView( this, "infoList" ); + infoList = new TQListView( this, "infoList" ); infoList->addColumn( "StreamID" ); infoList->addColumn( "Host" ); infoList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24 ); infoList->addColumn( "KB/s" ); infoList->addColumn( "Exit" ); - infoList->setColumnWidthMode(0, QListView::Manual); + infoList->setColumnWidthMode(0, TQListView::Manual); infoList->hideColumn(0); infoList->hideColumn(2); infoList->header()->setResizeEnabled(FALSE, 0); - infoList->setResizeMode( QListView::NoColumn ); - infoList->setHScrollBarMode(QScrollView::AlwaysOff); - infoList->setVScrollBarMode(QScrollView::AlwaysOff); - infoList->setSelectionMode( QListView::Single ); + infoList->setResizeMode( TQListView::NoColumn ); + infoList->setHScrollBarMode(TQScrollView::AlwaysOff); + infoList->setVScrollBarMode(TQScrollView::AlwaysOff); + infoList->setSelectionMode( TQListView::Single ); TabPageLayout->addMultiCellWidget( infoList, 1,1,0,7 ); infoList->setPaletteBackgroundColor(osdcolor); // infoList->header()->hide(); m_graphOut = new StatGraph(this,1,0,"Up"); m_graphIn = new StatGraph(this,1,0,"Down"); - m_graphOut->setReadingColor(Qt::red); - m_graphIn->setReadingColor(Qt::green); + m_graphOut->setReadingColor(TQt::red); + m_graphIn->setReadingColor(TQt::green); /* chart = new Chart(this, m_parent->speedHistoryTx(), m_parent->speedHistoryRx(), m_parent->historyBufferSize(), m_parent->historyPointer(), m_parent->maxSpeed()); TabPageLayout->addMultiCellWidget( chart, 2,2, 0,3 ); chart->setMinimumHeight(10);*/ @@ -224,12 +224,12 @@ void StreamOSD::renderOSD() //infoList->adjustSize(); //frame->update(); - connect( infoList, SIGNAL( contextMenuRequested(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) ); + connect( infoList, SIGNAL( contextMenuRequested(TQListViewItem*,const TQPoint&,int) ), this, SLOT( contextMenuRequested(TQListViewItem*,const TQPoint&,int) ) ); - QPoint point; - QRect rect( point, size() ); + TQPoint point; + TQRect rect( point, size() ); const uint M = fontMetrics().width( 'x' ); @@ -238,19 +238,19 @@ void StreamOSD::renderOSD() { /// apply the mask - static QBitmap mask; + static TQBitmap mask; mask.resize( size() ); - mask.fill( Qt::black ); + mask.fill( TQt::black ); - QPainter p( &mask ); - p.setBrush( Qt::white ); + TQPainter p( &mask ); + p.setBrush( TQt::white ); p.drawRoundRect( rect, xround, yround ); setMask( mask ); } m_osdBuffer.resize( rect.size() ); - QPainter p( &m_osdBuffer ); + TQPainter p( &m_osdBuffer ); p.fillRect( rect, backgroundColor() ); p.setPen( backgroundColor().dark() ); p.drawRoundRect( rect, xround, yround ); @@ -260,60 +260,60 @@ void StreamOSD::renderOSD() void StreamOSD::renderNonTorOSD() { - QColor osdcolor = Qt::green; + TQColor osdcolor = TQt::green; int large = font().pointSize(); int small = font().pointSize() - 1; - QFont f( font().rawName(), small ); + TQFont f( font().rawName(), small ); setFont( f ); - setWFlags( Qt::WX11BypassWM ); + setWFlags( TQt::WX11BypassWM ); setPalette(osdcolor); setPaletteBackgroundColor(osdcolor); //setBackgroundMode( PaletteBase ); - QGridLayout* TabPageLayout = new QGridLayout( this, 3, 8, 11, 6, "TabPageLayout"); + TQGridLayout* TabPageLayout = new TQGridLayout( this, 3, 8, 11, 6, "TabPageLayout"); TabPageLayout->setMargin(2); - QLabel* textLabel = new QLabel( this, "textLabel2" ); + TQLabel* textLabel = new TQLabel( this, "textLabel2" ); textLabel->setText(i18n("<b>Tor Traffic</b>")); - QFont f2( font().rawName(), large ); + TQFont f2( font().rawName(), large ); textLabel->setFont( f2 ); TabPageLayout->addMultiCellWidget( textLabel, 0,0,0,3 ); - QToolButton* hideMonitor = new QToolButton( this,"hide" ); + TQToolButton* hideMonitor = new TQToolButton( this,"hide" ); hideMonitor->setIconSet( SmallIconSet( "cancel" ) ); hideMonitor->setUsesTextLabel(false); - hideMonitor->setMaximumSize(SmallIconSet( "cancel" ).iconSize(QIconSet::Small)); + hideMonitor->setMaximumSize(SmallIconSet( "cancel" ).iconSize(TQIconSet::Small)); hideMonitor->adjustSize(); TabPageLayout->addWidget(hideMonitor,0,7); - QToolTip::add( hideMonitor,i18n("Hide this Display.")); + TQToolTip::add( hideMonitor,i18n("Hide this Display.")); - QToolTip::add( this,i18n("This displays all your system's network activity.")); + TQToolTip::add( this,i18n("This displays all your system's network activity.")); connect( hideMonitor, SIGNAL(clicked()), SLOT(slotHideMonitor()) ); - infoList = new QListView( this, "infoList" ); + infoList = new TQListView( this, "infoList" ); infoList->addColumn( "Program" ); infoList->addColumn( "Host" ); infoList->addColumn( "KB/s" ); - infoList->setColumnWidthMode(0, QListView::Manual); + infoList->setColumnWidthMode(0, TQListView::Manual); infoList->header()->setResizeEnabled(FALSE, 0); - infoList->setResizeMode( QListView::NoColumn ); - infoList->setHScrollBarMode(QScrollView::AlwaysOff); - infoList->setVScrollBarMode(QScrollView::AlwaysOff); - infoList->setSelectionMode( QListView::Single ); + infoList->setResizeMode( TQListView::NoColumn ); + infoList->setHScrollBarMode(TQScrollView::AlwaysOff); + infoList->setVScrollBarMode(TQScrollView::AlwaysOff); + infoList->setSelectionMode( TQListView::Single ); TabPageLayout->addMultiCellWidget( infoList, 1,1,0,7 ); infoList->setPaletteBackgroundColor(osdcolor); m_graphOut = new StatGraph(this,1,0,"Up"); m_graphIn = new StatGraph(this,1,0,"Down"); - m_graphOut->setReadingColor(Qt::red); - m_graphIn->setReadingColor(Qt::green); + m_graphOut->setReadingColor(TQt::red); + m_graphIn->setReadingColor(TQt::green); TabPageLayout->addMultiCellWidget( m_graphOut, 2,2, 0,3 ); TabPageLayout->addMultiCellWidget( m_graphIn, 2, 2, 4,7 ); - QPoint point; - QRect rect( point, size() ); + TQPoint point; + TQRect rect( point, size() ); const uint M = fontMetrics().width( 'x' ); @@ -322,19 +322,19 @@ void StreamOSD::renderNonTorOSD() { /// apply the mask - static QBitmap mask; + static TQBitmap mask; mask.resize( size() ); - mask.fill( Qt::black ); + mask.fill( TQt::black ); - QPainter p( &mask ); - p.setBrush( Qt::white ); + TQPainter p( &mask ); + p.setBrush( TQt::white ); p.drawRoundRect( rect, xround, yround ); setMask( mask ); } m_osdBuffer.resize( rect.size() ); - QPainter p( &m_osdBuffer ); + TQPainter p( &m_osdBuffer ); p.fillRect( rect, backgroundColor() ); p.setPen( backgroundColor().dark() ); p.drawRoundRect( rect, xround, yround ); @@ -345,19 +345,19 @@ void StreamOSD::renderNonTorOSD() void StreamOSD::setScreen( int screen ) { - const int n = QApplication::desktop()->numScreens(); + const int n = TQApplication::desktop()->numScreens(); m_screen = (screen >= n) ? n-1 : screen; reposition(); } -void StreamOSD::reposition( QSize newSize ) +void StreamOSD::reposition( TQSize newSize ) { if( !newSize.isValid() ) newSize = size(); - QPoint newPos = m_position; - const QRect& screen = QApplication::desktop()->screenGeometry( m_screen ); + TQPoint newPos = m_position; + const TQRect& screen = TQApplication::desktop()->screenGeometry( m_screen ); // now to properly resize if put into one of the corners we interpret the position // depending on the quadrant @@ -382,14 +382,14 @@ void StreamOSD::reposition( QSize newSize ) } -void StreamOSD::paintEvent( QPaintEvent* ) +void StreamOSD::paintEvent( TQPaintEvent* ) { bitBlt( this, 0, 0, &m_osdBuffer ); } -void StreamOSD::mousePressEvent( QMouseEvent* e ) +void StreamOSD::mousePressEvent( TQMouseEvent* e ) { m_dragOffset = e->pos(); @@ -405,7 +405,7 @@ void StreamOSD::mousePressEvent( QMouseEvent* e ) } -void StreamOSD::mouseReleaseEvent( QMouseEvent* ) +void StreamOSD::mouseReleaseEvent( TQMouseEvent* ) { if( m_dragging ) { m_dragging = false; @@ -414,16 +414,16 @@ void StreamOSD::mouseReleaseEvent( QMouseEvent* ) } -void StreamOSD::mouseMoveEvent( QMouseEvent* e ) +void StreamOSD::mouseMoveEvent( TQMouseEvent* e ) { if( m_dragging && this == mouseGrabber() ) { // check if the osd has been dragged out of the current screen - int currentScreen = QApplication::desktop()->screenNumber( e->globalPos() ); + int currentScreen = TQApplication::desktop()->screenNumber( e->globalPos() ); if( currentScreen != -1 ) m_screen = currentScreen; - const QRect& screen = QApplication::desktop()->screenGeometry( m_screen ); + const TQRect& screen = TQApplication::desktop()->screenGeometry( m_screen ); // make sure the position is valid m_position = fixupPosition( e->globalPos() - m_dragOffset - screen.topLeft() ); @@ -442,10 +442,10 @@ void StreamOSD::mouseMoveEvent( QMouseEvent* e ) } -QPoint StreamOSD::fixupPosition( const QPoint& pp ) +TQPoint StreamOSD::fixupPosition( const TQPoint& pp ) { - QPoint p(pp); - const QRect& screen = QApplication::desktop()->screenGeometry( m_screen ); + TQPoint p(pp); + const TQRect& screen = TQApplication::desktop()->screenGeometry( m_screen ); int maxY = screen.height() - height() - s_outerMargin; int maxX = screen.width() - width() - s_outerMargin; @@ -467,7 +467,7 @@ QPoint StreamOSD::fixupPosition( const QPoint& pp ) void StreamOSD::readSettings( KConfigBase* c ) { - QString oldGroup = c->group(); + TQString oldGroup = c->group(); if (m_tortraffic) c->setGroup( "TorKOSD Position" ); else @@ -482,7 +482,7 @@ void StreamOSD::readSettings( KConfigBase* c ) void StreamOSD::saveSettings( KConfigBase* c ) { - QString oldGroup = c->group(); + TQString oldGroup = c->group(); if (m_tortraffic) c->setGroup( "TorKOSD Position" ); else @@ -509,10 +509,10 @@ void StreamOSD::slotToggleKDE( ) emit requestToggleKDE(); } -void StreamOSD::contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void StreamOSD::contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( infoList ); + TQPopupMenu *menu = new TQPopupMenu( infoList ); menu->clear(); menu->insertItem( "Close Stream", this,SLOT(slotCloseStream()) ); @@ -524,7 +524,7 @@ void StreamOSD::contextMenuRequested( QListViewItem *, const QPoint &point, int void StreamOSD::slotCloseStream( ) { - QListViewItemIterator it(infoList, QListViewItemIterator::Selected); + TQListViewItemIterator it(infoList, TQListViewItemIterator::Selected); while ( it.current() ) { if (infoList->isSelected( it.current())) emit closeStream(it.current()->text(0)); diff --git a/src/newstreamosd.h b/src/newstreamosd.h index 9675968..95705a9 100644 --- a/src/newstreamosd.h +++ b/src/newstreamosd.h @@ -16,20 +16,20 @@ #ifndef _K3B_JOB_PROGRESS_OSD_H_ #define _K3B_JOB_PROGRESS_OSD_H_ -#include <qwidget.h> -#include <qpixmap.h> -#include <qlistview.h> -#include <qtoolbutton.h> +#include <ntqwidget.h> +#include <ntqpixmap.h> +#include <ntqlistview.h> +#include <ntqtoolbutton.h> #include "statgraph.h" #include "chart.h" -class QPaintEvent; -class QMouseEvent; +class TQPaintEvent; +class TQMouseEvent; class KConfigBase; -class QHBox; -class QListView; -class QToolButton; +class TQHBox; +class TQListView; +class TQToolButton; class StatGraph; class Chart; class torkView; @@ -38,7 +38,7 @@ class torkView; * * Insprired by Amarok's OSD (I also took a bit of their code. :) */ -class StreamOSD : public QWidget +class StreamOSD : public TQWidget { Q_OBJECT @@ -47,7 +47,7 @@ class StreamOSD : public QWidget ~StreamOSD(); int screen() const { return m_screen; } - const QPoint& position() const { return m_position; } + const TQPoint& position() const { return m_position; } void readSettings( KConfigBase* ); void saveSettings( KConfigBase* ); @@ -56,11 +56,11 @@ class StreamOSD : public QWidget void requestHideMonitor(); void requestToggleKDE(); void requestChangeID(); - void closeStream(const QString &); + void closeStream(const TQString &); public slots: void setScreen( int ); - void setText( const QString& ); + void setText( const TQString& ); void setProgress( int ); void slotHideMonitor(); void slotToggleKDE(); @@ -72,43 +72,43 @@ class StreamOSD : public QWidget * If for example the x coordinate is bigger than half the screen * width it refers to the left edge of the widget. */ - void setPosition( const QPoint& ); + void setPosition( const TQPoint& ); - void contextMenuRequested( QListViewItem *, const QPoint & point, int ); + void contextMenuRequested( TQListViewItem *, const TQPoint & point, int ); void slotCloseStream(); protected: - void paintEvent( QPaintEvent* ); - void mousePressEvent( QMouseEvent* ); - void mouseReleaseEvent( QMouseEvent* ); - void mouseMoveEvent( QMouseEvent* ); + void paintEvent( TQPaintEvent* ); + void mousePressEvent( TQMouseEvent* ); + void mouseReleaseEvent( TQMouseEvent* ); + void mouseMoveEvent( TQMouseEvent* ); void renderOSD(); void renderNonTorOSD(); void refresh(); - void reposition( QSize size = QSize() ); + void reposition( TQSize size = TQSize() ); public: - QListView* infoList; + TQListView* infoList; StatGraph* m_graphIn; StatGraph* m_graphOut; Chart* chart; - QToolButton* toggleKDE; - QToolButton* changeID; + TQToolButton* toggleKDE; + TQToolButton* changeID; private: /** * Ensure that the position is inside m_screen */ - QPoint fixupPosition( const QPoint& p ); + TQPoint fixupPosition( const TQPoint& p ); static const int s_outerMargin = 15; - QPixmap m_osdBuffer; + TQPixmap m_osdBuffer; bool m_dirty; - QString m_text; + TQString m_text; int m_progress; bool m_dragging; - QPoint m_dragOffset; + TQPoint m_dragOffset; int m_screen; - QPoint m_position; + TQPoint m_position; torkView* m_parent; bool m_tortraffic; diff --git a/src/overlayWidget.cpp b/src/overlayWidget.cpp index 331a66e..40653b3 100644 --- a/src/overlayWidget.cpp +++ b/src/overlayWidget.cpp @@ -21,14 +21,14 @@ #include "overlayWidget.h" //#include "statusbar.h" -#include <qpoint.h> +#include <ntqpoint.h> namespace KDE { -OverlayWidget::OverlayWidget( QWidget *parent, QWidget *anchor, const char* name ) - : QFrame( parent->parentWidget(), name ) +OverlayWidget::OverlayWidget( TQWidget *parent, TQWidget *anchor, const char* name ) + : TQFrame( parent->parentWidget(), name ) , m_anchor( anchor ) , m_parent( parent ) { @@ -44,16 +44,16 @@ OverlayWidget::reposition() adjustSize(); // p is in the alignWidget's coordinates - QPoint p; + TQPoint p; p.setX( m_anchor->width() - width() ); p.setY( -height() ); // Position in the toplevelwidget's coordinates - QPoint pTopLevel = m_anchor->mapTo( topLevelWidget(), p ); + TQPoint pTopLevel = m_anchor->mapTo( topLevelWidget(), p ); // Position in the widget's parentWidget coordinates - QPoint pParent = parentWidget() ->mapFrom( topLevelWidget(), pTopLevel ); + TQPoint pParent = parentWidget() ->mapFrom( topLevelWidget(), pTopLevel ); // keep it on the screen if( pParent.x() < 0 ) pParent.rx() = 0; @@ -63,28 +63,28 @@ OverlayWidget::reposition() } bool -OverlayWidget::eventFilter( QObject* o, QEvent* e ) +OverlayWidget::eventFilter( TQObject* o, TQEvent* e ) { - if ( e->type() == QEvent::Move || e->type() == QEvent::Resize ) + if ( e->type() == TQEvent::Move || e->type() == TQEvent::Resize ) reposition(); - return QFrame::eventFilter( o, e ); + return TQFrame::eventFilter( o, e ); } void -OverlayWidget::resizeEvent( QResizeEvent* ev ) +OverlayWidget::resizeEvent( TQResizeEvent* ev ) { reposition(); - QFrame::resizeEvent( ev ); + TQFrame::resizeEvent( ev ); } bool -OverlayWidget::event( QEvent *e ) +OverlayWidget::event( TQEvent *e ) { - if ( e->type() == QEvent::ChildInserted ) + if ( e->type() == TQEvent::ChildInserted ) adjustSize(); - return QFrame::event( e ); + return TQFrame::event( e ); } } diff --git a/src/overlayWidget.h b/src/overlayWidget.h index 94d635a..7640212 100644 --- a/src/overlayWidget.h +++ b/src/overlayWidget.h @@ -20,28 +20,28 @@ #ifndef KDEOVERLAYWIDGET_H #define KDEOVERLAYWIDGET_H -#include <qhbox.h> +#include <ntqhbox.h> namespace KDE { - class OverlayWidget : public QFrame + class OverlayWidget : public TQFrame { public: /** * The widget is parented to the toplevelwidget of alignWidget, * this could be an issue if that widget has an autoAdd Layout */ - OverlayWidget( QWidget *parent, QWidget *anchor, const char *name = 0 ); + OverlayWidget( TQWidget *parent, TQWidget *anchor, const char *name = 0 ); virtual void reposition(); protected: - virtual void resizeEvent( QResizeEvent* ); - virtual bool eventFilter( QObject*, QEvent* ); - virtual bool event( QEvent* ); + virtual void resizeEvent( TQResizeEvent* ); + virtual bool eventFilter( TQObject*, TQEvent* ); + virtual bool event( TQEvent* ); private: - QWidget *m_anchor; - QWidget *m_parent; + TQWidget *m_anchor; + TQWidget *m_parent; }; } diff --git a/src/paranoia.ui b/src/paranoia.ui index 26ccdb2..9198527 100644 --- a/src/paranoia.ui +++ b/src/paranoia.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>FilterTable</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>FilterTable</cstring> </property> @@ -30,11 +30,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="2" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string></string> @@ -92,7 +92,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>pushAdd</cstring> </property> @@ -103,12 +103,12 @@ <string>Alt+A</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>Description</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -116,7 +116,7 @@ <string>Description:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -124,12 +124,12 @@ <string>Rule:</string> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>Filter</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -137,7 +137,7 @@ <string>This is a list of filter rules that will route all DNS requests to Tor:</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_DNSFailSafeParanoia</cstring> </property> @@ -147,7 +147,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -158,7 +158,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_3_2_3</cstring> </property> @@ -166,7 +166,7 @@ <string>Description:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_3_4</cstring> </property> @@ -174,7 +174,7 @@ <string>Rule:</string> </property> </widget> - <widget class="QListView" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="2" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string></string> @@ -221,7 +221,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_SystemFailSafeParanoia</cstring> </property> @@ -232,7 +232,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel1_2_3</cstring> </property> @@ -240,7 +240,7 @@ <string>This is a list of filter rules that will route certain system traffic to Tor:</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>pushAdd_Sys</cstring> </property> @@ -251,12 +251,12 @@ <string>Alt+A</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>SystemDescription</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>SystemFilter</cstring> </property> @@ -281,15 +281,15 @@ </connection> <connection> <sender>FilterRules</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>FilterTable</receiver> - <slot>FilterRules_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>FilterRules_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>SystemFilterRules</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>FilterTable</receiver> - <slot>SystemFilterRules_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>SystemFilterRules_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> </connections> <includes> @@ -298,8 +298,8 @@ <slots> <slot>pushAdd_clicked()</slot> <slot>pushAdd_Sys_clicked()</slot> - <slot>FilterRules_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> - <slot>SystemFilterRules_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>FilterRules_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> + <slot>SystemFilterRules_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> <slot>slotToggleEntry()</slot> <slot>slotDeleteSystemEntry()</slot> diff --git a/src/paranoia.ui.h b/src/paranoia.ui.h index 4529e49..088b7c0 100644 --- a/src/paranoia.ui.h +++ b/src/paranoia.ui.h @@ -21,56 +21,56 @@ #include "torkconfig.h" #include <klocale.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> #include <kiconloader.h> void FilterTable::init() { - FilterRules->setSelectionMode( QListView::Extended ); - FilterRules->setColumnWidthMode(0, QListView::Manual); + FilterRules->setSelectionMode( TQListView::Extended ); + FilterRules->setColumnWidthMode(0, TQListView::Manual); FilterRules->hideColumn(0); FilterRules->header()->setResizeEnabled(FALSE, 0); - FilterRules->setResizeMode( QListView::NoColumn ); + FilterRules->setResizeMode( TQListView::NoColumn ); - SystemFilterRules->setSelectionMode( QListView::Extended ); - SystemFilterRules->setColumnWidthMode(0, QListView::Manual); + SystemFilterRules->setSelectionMode( TQListView::Extended ); + SystemFilterRules->setColumnWidthMode(0, TQListView::Manual); SystemFilterRules->hideColumn(0); SystemFilterRules->header()->setResizeEnabled(FALSE, 0); - SystemFilterRules->setResizeMode( QListView::NoColumn ); + SystemFilterRules->setResizeMode( TQListView::NoColumn ); - QStringList filterRules = TorkConfig::filterRules(); + TQStringList filterRules = TorkConfig::filterRules(); - QListViewItem *tm; - for ( QStringList::Iterator it = filterRules.begin(); it != filterRules.end(); ++it ) + TQListViewItem *tm; + for ( TQStringList::Iterator it = filterRules.begin(); it != filterRules.end(); ++it ) { if ((*it).isEmpty()) continue; - QString active = (*it).section("%:%",0,0); - QString desc = (*it).section("%:%",1,1); - QString entry = (*it).section("%:%",2,2); + TQString active = (*it).section("%:%",0,0); + TQString desc = (*it).section("%:%",1,1); + TQString entry = (*it).section("%:%",2,2); - tm = new QListViewItem(FilterRules,active,desc,entry); + tm = new TQListViewItem(FilterRules,active,desc,entry); - tm->setPixmap( 1, QPixmap(SmallIcon(active ))); + tm->setPixmap( 1, TQPixmap(SmallIcon(active ))); } - QStringList systemFilterRules = TorkConfig::systemFilterRules(); + TQStringList systemFilterRules = TorkConfig::systemFilterRules(); - for ( QStringList::Iterator it = systemFilterRules.begin(); it != systemFilterRules.end(); ++it ) + for ( TQStringList::Iterator it = systemFilterRules.begin(); it != systemFilterRules.end(); ++it ) { if ((*it).isEmpty()) continue; - QString active = (*it).section("%:%",0,0); - QString desc = (*it).section("%:%",1,1); - QString entry = (*it).section("%:%",2,2); + TQString active = (*it).section("%:%",0,0); + TQString desc = (*it).section("%:%",1,1); + TQString entry = (*it).section("%:%",2,2); - tm = new QListViewItem(SystemFilterRules,active,desc,entry); + tm = new TQListViewItem(SystemFilterRules,active,desc,entry); - tm->setPixmap( 1, QPixmap(SmallIcon(active ))); + tm->setPixmap( 1, TQPixmap(SmallIcon(active ))); } @@ -78,21 +78,21 @@ void FilterTable::init() void FilterTable::pushAdd_clicked() { - new QListViewItem(FilterRules,Description->text().replace("%:%",""),Filter->text().replace("%:%","")); + new TQListViewItem(FilterRules,Description->text().replace("%:%",""),Filter->text().replace("%:%","")); } void FilterTable::pushAdd_Sys_clicked() { - new QListViewItem(SystemFilterRules,SystemDescription->text().replace("%:%",""),SystemFilter->text().replace("%:%","")); + new TQListViewItem(SystemFilterRules,SystemDescription->text().replace("%:%",""),SystemFilter->text().replace("%:%","")); } -void FilterTable::FilterRules_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void FilterTable::FilterRules_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( FilterRules ); + TQPopupMenu *menu = new TQPopupMenu( FilterRules ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -102,10 +102,10 @@ void FilterTable::FilterRules_contextMenuRequested( QListViewItem *, const QPoin } -void FilterTable::SystemFilterRules_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void FilterTable::SystemFilterRules_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( SystemFilterRules ); + TQPopupMenu *menu = new TQPopupMenu( SystemFilterRules ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteSystemEntry()) ); @@ -119,7 +119,7 @@ void FilterTable::SystemFilterRules_contextMenuRequested( QListViewItem *, const void FilterTable::slotDeleteEntry( ) { - QListViewItemIterator it(FilterRules, QListViewItemIterator::Selected); + TQListViewItemIterator it(FilterRules, TQListViewItemIterator::Selected); while ( it.current() ) { if (FilterRules->isSelected( it.current())) delete it.current(); @@ -132,15 +132,15 @@ void FilterTable::slotDeleteEntry( ) void FilterTable::slotToggleEntry( ) { - QListViewItemIterator it(FilterRules, QListViewItemIterator::Selected); + TQListViewItemIterator it(FilterRules, TQListViewItemIterator::Selected); while ( it.current() ) { if (FilterRules->isSelected( it.current())){ - QString active = "button_cancel"; + TQString active = "button_cancel"; if (it.current()->text(0).contains("button_cancel")) active = "button_ok"; it.current()->setText(0,active); - it.current()->setPixmap( 1, QPixmap(SmallIcon(active))); + it.current()->setPixmap( 1, TQPixmap(SmallIcon(active))); } ++it; } @@ -151,7 +151,7 @@ void FilterTable::slotToggleEntry( ) void FilterTable::slotDeleteSystemEntry( ) { - QListViewItemIterator it(SystemFilterRules, QListViewItemIterator::Selected); + TQListViewItemIterator it(SystemFilterRules, TQListViewItemIterator::Selected); while ( it.current() ) { if (SystemFilterRules->isSelected( it.current())) delete it.current(); @@ -164,15 +164,15 @@ void FilterTable::slotDeleteSystemEntry( ) void FilterTable::slotToggleSystemEntry( ) { - QListViewItemIterator it(SystemFilterRules, QListViewItemIterator::Selected); + TQListViewItemIterator it(SystemFilterRules, TQListViewItemIterator::Selected); while ( it.current() ) { if (SystemFilterRules->isSelected( it.current())){ - QString active = "button_cancel"; + TQString active = "button_cancel"; if (it.current()->text(0).contains("button_cancel")) active = "button_ok"; it.current()->setText(0,active); - it.current()->setPixmap( 1, QPixmap(SmallIcon(active))); + it.current()->setPixmap( 1, TQPixmap(SmallIcon(active))); } ++it; } @@ -189,9 +189,9 @@ void FilterTable::slotToggleSystemEntry( ) // </connection> // <connection> // <sender>FilterRules</sender> -// <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> +// <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> // <receiver>FilterTable</receiver> -// <slot>FilterRules_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> +// <slot>FilterRules_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> // </connection> // </connections> // <includes> @@ -199,7 +199,7 @@ void FilterTable::slotToggleSystemEntry( ) // </includes> // <slots> // <slot>pushAdd_clicked()</slot> -// <slot>FilterRules_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> +// <slot>FilterRules_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> // <slot>slotDeleteEntry()</slot> // </slots> // <functions> diff --git a/src/popupMessage.cpp b/src/popupMessage.cpp index d14c171..adff918 100644 --- a/src/popupMessage.cpp +++ b/src/popupMessage.cpp @@ -47,18 +47,18 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#include <qfont.h> -#include <qframe.h> -#include <qlabel.h> -#include <qmessagebox.h> -#include <qpainter.h> -#include <qtimer.h> -#include <qcheckbox.h> +#include <ntqfont.h> +#include <ntqframe.h> +#include <ntqlabel.h> +#include <ntqmessagebox.h> +#include <ntqpainter.h> +#include <ntqtimer.h> +#include <ntqcheckbox.h> namespace KDE { -PopupMessage::PopupMessage( QWidget *parent, QWidget *anchor, int timeout, const char *name ) +PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, const char *name ) : OverlayWidget( parent, anchor, name ) , m_anchor( anchor ) , m_parent( parent ) @@ -74,41 +74,41 @@ PopupMessage::PopupMessage( QWidget *parent, QWidget *anchor, int timeout, const , m_name( name ) { - setFrameStyle( QFrame::Panel | QFrame::Raised ); - setFrameShape( QFrame::StyledPanel ); - setWFlags( Qt::WX11BypassWM ); + setFrameStyle( TQFrame::Panel | TQFrame::Raised ); + setFrameShape( TQFrame::StyledPanel ); + setWFlags( TQt::WX11BypassWM ); - QHBoxLayout *hbox; - QLabel *label; + TQHBoxLayout *hbox; + TQLabel *label; KActiveLabel *alabel; - m_layout = new QVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); + m_layout = new TQVBoxLayout( this, 9 /*margin*/, 6 /*spacing*/ ); - hbox = new QHBoxLayout( m_layout, 12 ); + hbox = new TQHBoxLayout( m_layout, 12 ); - hbox->addWidget( m_countdownFrame = new QFrame( this, "counterVisual" ) ); + hbox->addWidget( m_countdownFrame = new TQFrame( this, "counterVisual" ) ); m_countdownFrame->setFixedWidth( fontMetrics().width( "X" ) ); - m_countdownFrame->setFrameStyle( QFrame::Plain | QFrame::Box ); + m_countdownFrame->setFrameStyle( TQFrame::Plain | TQFrame::Box ); m_countdownFrame->setPaletteForegroundColor( paletteBackgroundColor().dark() ); - label = new QLabel( this, "image" ); + label = new TQLabel( this, "image" ); hbox->add( label ); alabel = new KActiveLabel( this, "label" ); - alabel->setTextFormat( Qt::RichText ); - alabel->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred ); + alabel->setTextFormat( TQt::RichText ); + alabel->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred ); hbox->add( alabel ); - hbox = new QHBoxLayout( m_layout ); + hbox = new TQHBoxLayout( m_layout ); if (configurableType()){ - hbox->add( new QCheckBox( this, "showWarnings" ) ); - static_cast<QCheckBox*>(child( "showWarnings" ))->setText(QString("%1 in Future.").arg(m_name)); - static_cast<QCheckBox*>(child( "showWarnings" ))->setChecked(TRUE); + hbox->add( new TQCheckBox( this, "showWarnings" ) ); + static_cast<TQCheckBox*>(child( "showWarnings" ))->setText(TQString("%1 in Future.").arg(m_name)); + static_cast<TQCheckBox*>(child( "showWarnings" ))->setChecked(TRUE); connect( child( "showWarnings" ), SIGNAL(toggled( bool )), SLOT(toggled( bool )) ); } - hbox->addItem( new QSpacerItem( 4, 4, QSizePolicy::Expanding, QSizePolicy::Preferred ) ); + hbox->addItem( new TQSpacerItem( 4, 4, TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); hbox->add( new KPushButton( KStdGuiItem::yes(), this, "yesButton" ) ); hbox->add( new KPushButton( KStdGuiItem::no(), this, "closeButton" ) ); hbox->add( new KPushButton( KStdGuiItem::ok(), this, "okButton" ) ); @@ -119,7 +119,7 @@ PopupMessage::PopupMessage( QWidget *parent, QWidget *anchor, int timeout, const } -void PopupMessage::addWidget( QWidget *widget ) +void PopupMessage::addWidget( TQWidget *widget ) { m_layout->add( widget ); adjustSize(); @@ -145,25 +145,25 @@ void PopupMessage::showOkButton( const bool show ) void PopupMessage::showCounter( const bool show ) { m_showCounter = show; - static_cast<QFrame*>(child( "counterVisual" ))->setShown( show ); + static_cast<TQFrame*>(child( "counterVisual" ))->setShown( show ); adjustSize(); } -void PopupMessage::setText( const QString &text ) +void PopupMessage::setText( const TQString &text ) { static_cast<KActiveLabel*>(child( "label" ))->setText( text ); adjustSize(); } -void PopupMessage::setImage( const QString &location ) +void PopupMessage::setImage( const TQString &location ) { - static_cast<QLabel*>(child( "image" ))->setPixmap( QPixmap( location ) ); + static_cast<TQLabel*>(child( "image" ))->setPixmap( TQPixmap( location ) ); adjustSize(); } -void PopupMessage::setImage( const QPixmap &pix ) +void PopupMessage::setImage( const TQPixmap &pix ) { - static_cast<QLabel*>(child( "image" ))->setPixmap( pix ); + static_cast<TQLabel*>(child( "image" ))->setPixmap( pix ); adjustSize(); } @@ -198,7 +198,7 @@ void PopupMessage::close() //SLOT void PopupMessage::toggled( bool on) //SLOT { - QString mtype = QString("%1").arg(m_name); + TQString mtype = TQString("%1").arg(m_name); if (mtype.contains("Usage")) TorkConfig::setShowUsageWarnings(on); @@ -216,7 +216,7 @@ void PopupMessage::toggled( bool on) //SLOT bool PopupMessage::configurableType() //SLOT { - QString mtype = QString(m_name); + TQString mtype = TQString(m_name); if ((mtype.contains("Usage")) || (mtype.contains("DNS")) || (mtype.contains("Security")) @@ -252,7 +252,7 @@ void PopupMessage::display() //SLOT // Protected //////////////////////////////////////////////////////////////////////// -void PopupMessage::timerEvent( QTimerEvent* ) +void PopupMessage::timerEvent( TQTimerEvent* ) { switch( m_maskEffect ) { @@ -278,10 +278,10 @@ void PopupMessage::countDown() return; } - QFrame *&h = m_countdownFrame; + TQFrame *&h = m_countdownFrame; if( m_counter < h->height() - 3 ) - QPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, palette().active().highlight() ); + TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, palette().active().highlight() ); if( !hasMouse() ) m_counter++; @@ -304,19 +304,19 @@ void PopupMessage::dissolveMask() if( m_stage == 1 ) { repaint( false ); - QPainter maskPainter(&m_mask); + TQPainter maskPainter(&m_mask); - m_mask.fill(Qt::black); + m_mask.fill(TQt::black); - maskPainter.setBrush(Qt::white); - maskPainter.setPen(Qt::white); + maskPainter.setBrush(TQt::white); + maskPainter.setPen(TQt::white); maskPainter.drawRect( m_mask.rect() ); m_dissolveSize += m_dissolveDelta; if( m_dissolveSize > 0 ) { - maskPainter.setRasterOp( Qt::EraseROP ); + maskPainter.setRasterOp( TQt::EraseROP ); int x, y, s; const int size = 16; diff --git a/src/popupMessage.h b/src/popupMessage.h index 9dc73b7..3b2e8ee 100644 --- a/src/popupMessage.h +++ b/src/popupMessage.h @@ -28,9 +28,9 @@ #include "overlayWidget.h" //#include "functor.h" -#include <qbitmap.h> -#include <qlayout.h> -#include <qpixmap.h> +#include <ntqbitmap.h> +#include <ntqlayout.h> +#include <ntqpixmap.h> namespace KDE { @@ -53,18 +53,18 @@ namespace KDE * @param timeout : how long to wait before auto closing. A value of 0 means close * only on pressing the closeButton or close() is called. */ - PopupMessage( QWidget *parent, QWidget *anchor, int timeout = 5000 /*milliseconds*/, const char* name = 0 ); + PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout = 5000 /*milliseconds*/, const char* name = 0 ); enum MaskEffect { Plain, Slide, Dissolve }; - void addWidget( QWidget *widget ); + void addWidget( TQWidget *widget ); void showBothButton( const bool show ); void showOkButton( const bool show ); void showCounter( const bool show ); - void setImage( const QString &location ); - void setImage( const QPixmap &pix ); + void setImage( const TQString &location ); + void setImage( const TQPixmap &pix ); void setMaskEffect( const MaskEffect type ) { m_maskEffect = type; } - void setText( const QString &text ); + void setText( const TQString &text ); void setTimeout( const int time ) { m_timeout = time; } public slots: @@ -75,7 +75,7 @@ namespace KDE void toggled( bool ); protected: - void timerEvent( QTimerEvent* ); + void timerEvent( TQTimerEvent* ); void countDown(); /** @@ -96,11 +96,11 @@ namespace KDE private: bool configurableType(); - QVBoxLayout *m_layout; - QFrame *m_countdownFrame; - QWidget *m_anchor; - QWidget *m_parent; - QBitmap m_mask; + TQVBoxLayout *m_layout; + TQFrame *m_countdownFrame; + TQWidget *m_anchor; + TQWidget *m_parent; + TQBitmap m_mask; MaskEffect m_maskEffect; int m_dissolveSize; @@ -116,7 +116,7 @@ namespace KDE bool m_question; bool m_respondedTo; - QString m_name; + TQString m_name; }; } diff --git a/src/questions.h b/src/questions.h index fb3f882..3b14b68 100644 --- a/src/questions.h +++ b/src/questions.h @@ -22,20 +22,20 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "tork.h" -#include <qstring.h> +#include <ntqstring.h> /** A variable allowed in the configuration file or on the command line. */ typedef struct question_t { const char *logquestion; /**< The full keyword (case insensitive). */ - const QString headline; /**< String (or null) describing initial value. */ - const QString body; /**< String (or null) describing initial value. */ + const TQString headline; /**< String (or null) describing initial value. */ + const TQString body; /**< String (or null) describing initial value. */ char torsaid[250]; /**< String (or null) describing initial value. */ - const QString question; /**< String (or null) describing initial value. */ + const TQString question; /**< String (or null) describing initial value. */ display_status_t state; /**< The type of the value. */ bool persistent; bool showstopper; - const QString type; /**< String (or null) describing initial value. */ + const TQString type; /**< String (or null) describing initial value. */ const char *icon; /**< String (or null) describing initial value. */ bool (tork::*pt2Member2)(); void (tork::*silentAction)(); diff --git a/src/quickconfig.ui b/src/quickconfig.ui index c027c26..374e8d7 100644 --- a/src/quickconfig.ui +++ b/src/quickconfig.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>QuickConfig</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>QuickConfig</cstring> </property> @@ -27,14 +27,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> <property name="title"> <string>Messages</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowDNSLeaks</cstring> </property> @@ -50,7 +50,7 @@ <string>Show DNS Leak Warnings</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowSecurityWarnings</cstring> </property> @@ -66,7 +66,7 @@ <string>Show Security Warnings</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowUsageWarnings</cstring> </property> @@ -82,7 +82,7 @@ <string>Show Usage Warnings</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -98,7 +98,7 @@ <string><b>Warning Messages</b></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -114,7 +114,7 @@ <string><b>Question Messages</b></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowGuideQuestions</cstring> </property> @@ -130,7 +130,7 @@ <string>Show Guide Questions</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_ShowApplySettingsQuestions</cstring> </property> @@ -147,7 +147,7 @@ </property> </widget> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>quickGroup</cstring> </property> @@ -158,7 +158,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="4" column="3" rowspan="2" colspan="2"> + <widget class="TQLabel" row="4" column="3" rowspan="2" colspan="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -200,7 +200,7 @@ </size> </property> </spacer> - <widget class="QSpinBox" row="5" column="4"> + <widget class="TQSpinBox" row="5" column="4"> <property name="name"> <cstring>kcfg_RemoteTorPort</cstring> </property> @@ -228,7 +228,7 @@ </size> </property> </spacer> - <widget class="QComboBox" row="2" column="1" rowspan="1" colspan="4"> + <widget class="TQComboBox" row="2" column="1" rowspan="1" colspan="4"> <item> <property name="text"> <string>Run a Tor Client and Server With Default Settings</string> @@ -307,7 +307,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="6"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -316,7 +316,7 @@ <p> <b>If you choose to manage a remote instance of Tor or a local instance that's already running, only configuration changes made after you have connected to the remote instance will be applied to it.</b></string> </property> </widget> - <widget class="QCheckBox" row="7" column="1" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="7" column="1" rowspan="1" colspan="5"> <property name="name"> <cstring>kcfg_AlwaysAnonymizeKDE</cstring> </property> @@ -352,7 +352,7 @@ </size> </property> </spacer> - <widget class="QLineEdit" row="5" column="2"> + <widget class="TQLineEdit" row="5" column="2"> <property name="name"> <cstring>kcfg_RemoteTorAddress</cstring> </property> @@ -360,7 +360,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> diff --git a/src/quickconfig.ui.h b/src/quickconfig.ui.h index eb4f518..167b2b9 100644 --- a/src/quickconfig.ui.h +++ b/src/quickconfig.ui.h @@ -22,8 +22,8 @@ #include "torkconfig.h" #include <klocale.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> #include <dcopref.h> #include <kconfig.h> diff --git a/src/running.ui b/src/running.ui index fd87ecb..3e7caa3 100644 --- a/src/running.ui +++ b/src/running.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Running</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>Running</cstring> </property> @@ -30,11 +30,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>I_m_</cstring> </property> @@ -59,7 +59,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -67,7 +67,7 @@ <string><p>Use this special authoritative server for fetching the list of trusted servers. I hereby acknowledge that using such a server makes me more identifiable because I 'm not trusting the same servers as everyone else.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>kcfg_DirServer</cstring> </property> @@ -142,7 +142,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>NormalOptions</cstring> </property> @@ -156,7 +156,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -164,7 +164,7 @@ <string>Run as User</string> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>pushButton10</cstring> </property> @@ -172,7 +172,7 @@ <string>..</string> </property> </widget> - <widget class="QPushButton" row="0" column="8"> + <widget class="TQPushButton" row="0" column="8"> <property name="name"> <cstring>pushButton10_2</cstring> </property> @@ -180,7 +180,7 @@ <string>..</string> </property> </widget> - <widget class="QLabel" row="0" column="3" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="3" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -188,7 +188,7 @@ <string>or as Group</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -196,12 +196,12 @@ <string>Use this directory for temporary runtime storage: </string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_User</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="7"> + <widget class="TQLineEdit" row="0" column="7"> <property name="name"> <cstring>kcfg_Group</cstring> </property> @@ -216,7 +216,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_DefaultRunningNormalOptions</cstring> </property> @@ -230,7 +230,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>Authentication</cstring> </property> @@ -241,7 +241,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_4</cstring> </property> @@ -249,7 +249,7 @@ <string>Use this password to control Tor:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_CookieAuthentication</cstring> </property> @@ -260,12 +260,12 @@ <string>Alt+A</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_HashedControlPassword</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_GenerateRandomPassword</cstring> </property> @@ -280,7 +280,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget9</cstring> </property> @@ -291,7 +291,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -302,7 +302,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="2" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -310,7 +310,7 @@ <string>Port:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -318,7 +318,7 @@ <string>IP:</string> </property> </widget> - <widget class="QPushButton" row="2" column="6"> + <widget class="TQPushButton" row="2" column="6"> <property name="name"> <cstring>PushAdd</cstring> </property> @@ -329,7 +329,7 @@ <string>Alt+K</string> </property> </widget> - <widget class="QListView" row="0" column="4" rowspan="2" colspan="3"> + <widget class="TQListView" row="0" column="4" rowspan="2" colspan="3"> <column> <property name="text"> <string>IP Address </string> @@ -362,17 +362,17 @@ <bool>true</bool> </property> </widget> - <widget class="QLineEdit" row="2" column="4"> + <widget class="TQLineEdit" row="2" column="4"> <property name="name"> <cstring>Address</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TQLineEdit" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>kcfg_SOCKSBindAddressHost</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="3" rowspan="2" colspan="1"> + <widget class="TQSpinBox" row="1" column="3" rowspan="2" colspan="1"> <property name="name"> <cstring>kcfg_SOCKSBindAddressPort</cstring> </property> @@ -380,7 +380,7 @@ <number>9999</number> </property> </widget> - <widget class="QSpinBox" row="2" column="5"> + <widget class="TQSpinBox" row="2" column="5"> <property name="name"> <cstring>Port</cstring> </property> @@ -388,7 +388,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel7_2</cstring> </property> @@ -398,7 +398,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -409,7 +409,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQListView" row="0" column="1" rowspan="1" colspan="4"> <column> <property name="text"> <string>Policy</string> @@ -453,7 +453,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>SocksPort</cstring> </property> @@ -461,7 +461,7 @@ <number>9999</number> </property> </widget> - <widget class="QPushButton" row="1" column="4"> + <widget class="TQPushButton" row="1" column="4"> <property name="name"> <cstring>PushAdd2</cstring> </property> @@ -469,12 +469,12 @@ <string>OK</string> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>SocksAddress</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>accept</string> @@ -506,7 +506,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -526,15 +526,15 @@ <connections> <connection> <sender>SOCKSPolicy</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>Running</receiver> - <slot>SOCKSPolicy_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>SOCKSPolicy_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>SOCKSBindAddressMany</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>Running</receiver> - <slot>SOCKSBindAddressMany_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>SOCKSBindAddressMany_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>PushAdd</sender> @@ -556,9 +556,9 @@ </connection> <connection> <sender>kcfg_HashedControlPassword</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>Running</receiver> - <slot>kcfg_HashedControlPassword_textChanged(const QString&)</slot> + <slot>kcfg_HashedControlPassword_textChanged(const TQString&)</slot> </connection> <connection> <sender>kcfg_CookieAuthentication</sender> @@ -573,13 +573,13 @@ <slots> <slot>PushAdd_clicked()</slot> <slot>PushAdd2_clicked()</slot> - <slot>SOCKSBindAddressMany_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>SOCKSBindAddressMany_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> - <slot>SOCKSPolicy_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>SOCKSPolicy_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeletePolicyEntry()</slot> <slot>kcfg_DefaultRunningNormalOptions_toggled( bool state )</slot> <slot>kcfg_CookieAuthentication_toggled( bool )</slot> - <slot>kcfg_HashedControlPassword_textChanged( const QString & )</slot> + <slot>kcfg_HashedControlPassword_textChanged( const TQString & )</slot> </slots> <functions> <function access="private" specifier="non virtual">init()</function> diff --git a/src/running.ui.h b/src/running.ui.h index 8111ad9..f3c17b3 100644 --- a/src/running.ui.h +++ b/src/running.ui.h @@ -22,57 +22,57 @@ //dummy #include "torkconfig.h" #include <klocale.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> void Running::init() { - QStringList existingMaps = TorkConfig::sOCKSBindAddressMany(); - QListViewItem *tm; - for ( QStringList::Iterator it = existingMaps.begin(); it != existingMaps.end(); ++it ) + TQStringList existingMaps = TorkConfig::sOCKSBindAddressMany(); + TQListViewItem *tm; + for ( TQStringList::Iterator it = existingMaps.begin(); it != existingMaps.end(); ++it ) { if ((*it).isEmpty()) continue; - QString entry = (*it).section(":",0,0); - QString port = (*it).section(":",1,1); + TQString entry = (*it).section(":",0,0); + TQString port = (*it).section(":",1,1); - tm = new QListViewItem(SOCKSBindAddressMany,entry,port); + tm = new TQListViewItem(SOCKSBindAddressMany,entry,port); } - QStringList existingSocksPolicies = TorkConfig::sOCKSPolicy(); + TQStringList existingSocksPolicies = TorkConfig::sOCKSPolicy(); - for ( QStringList::Iterator it = existingSocksPolicies.begin(); it != existingSocksPolicies.end(); ++it ) + for ( TQStringList::Iterator it = existingSocksPolicies.begin(); it != existingSocksPolicies.end(); ++it ) { if ((*it).isEmpty()) continue; - QString policy = (*it).section(" ",0,0); - QString section2 = (*it).section(" ",1,1); - QString entry = section2.section(":",0,0); - QString port = section2.section(":",1,1); + TQString policy = (*it).section(" ",0,0); + TQString section2 = (*it).section(" ",1,1); + TQString entry = section2.section(":",0,0); + TQString port = section2.section(":",1,1); - tm = new QListViewItem(SOCKSPolicy,policy,entry,port); + tm = new TQListViewItem(SOCKSPolicy,policy,entry,port); } } void Running::PushAdd_clicked() { - new QListViewItem(SOCKSBindAddressMany,Address->text(), Port->text()); + new TQListViewItem(SOCKSBindAddressMany,Address->text(), Port->text()); } void Running::PushAdd2_clicked() { - new QListViewItem(SOCKSPolicy,Policy->currentText(),SocksAddress->text(), SocksPort->text()); + new TQListViewItem(SOCKSPolicy,Policy->currentText(),SocksAddress->text(), SocksPort->text()); } -void Running::SOCKSBindAddressMany_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void Running::SOCKSBindAddressMany_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( SOCKSBindAddressMany ); + TQPopupMenu *menu = new TQPopupMenu( SOCKSBindAddressMany ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -84,7 +84,7 @@ void Running::SOCKSBindAddressMany_contextMenuRequested( QListViewItem *, const void Running::slotDeleteEntry( ) { - QListViewItemIterator it(SOCKSBindAddressMany, QListViewItemIterator::Selected); + TQListViewItemIterator it(SOCKSBindAddressMany, TQListViewItemIterator::Selected); while ( it.current() ) { if (SOCKSBindAddressMany->isSelected( it.current())) delete it.current(); @@ -94,10 +94,10 @@ void Running::slotDeleteEntry( ) } -void Running::SOCKSPolicy_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void Running::SOCKSPolicy_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( SOCKSPolicy ); + TQPopupMenu *menu = new TQPopupMenu( SOCKSPolicy ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeletePolicyEntry()) ); @@ -109,7 +109,7 @@ void Running::SOCKSPolicy_contextMenuRequested( QListViewItem *, const QPoint &p void Running::slotDeletePolicyEntry( ) { - QListViewItemIterator it(SOCKSPolicy, QListViewItemIterator::Selected); + TQListViewItemIterator it(SOCKSPolicy, TQListViewItemIterator::Selected); while ( it.current() ) { if (SOCKSPolicy->isSelected( it.current())) delete it.current(); @@ -137,7 +137,7 @@ void Running::kcfg_CookieAuthentication_toggled( bool ) } -void Running::kcfg_HashedControlPassword_textChanged( const QString & ) +void Running::kcfg_HashedControlPassword_textChanged( const TQString & ) { if (! kcfg_HashedControlPassword->text().isEmpty()){ kcfg_CookieAuthentication->setEnabled(false); @@ -151,15 +151,15 @@ void Running::kcfg_HashedControlPassword_textChanged( const QString & ) // <connections> // <connection> // <sender>SOCKSPolicy</sender> -// <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> +// <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> // <receiver>Running</receiver> -// <slot>SOCKSPolicy_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> +// <slot>SOCKSPolicy_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> // </connection> // <connection> // <sender>SOCKSBindAddressMany</sender> -// <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> +// <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> // <receiver>Running</receiver> -// <slot>SOCKSBindAddressMany_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> +// <slot>SOCKSBindAddressMany_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> // </connection> // <connection> // <sender>PushAdd</sender> @@ -181,9 +181,9 @@ void Running::kcfg_HashedControlPassword_textChanged( const QString & ) // </connection> // <connection> // <sender>kcfg_HashedControlPassword</sender> -// <signal>textChanged(const QString&)</signal> +// <signal>textChanged(const TQString&)</signal> // <receiver>Running</receiver> -// <slot>kcfg_HashedControlPassword_textChanged(const QString&)</slot> +// <slot>kcfg_HashedControlPassword_textChanged(const TQString&)</slot> // </connection> // <connection> // <sender>kcfg_CookieAuthentication</sender> @@ -204,12 +204,12 @@ void Running::kcfg_HashedControlPassword_textChanged( const QString & ) // <slots> // <slot>PushAdd_clicked()</slot> // <slot>PushAdd2_clicked()</slot> -// <slot>SOCKSBindAddressMany_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> +// <slot>SOCKSBindAddressMany_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> // <slot>slotDeleteEntry()</slot> -// <slot>SOCKSPolicy_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> +// <slot>SOCKSPolicy_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> // <slot>slotDeletePolicyEntry()</slot> // <slot>kcfg_DefaultRunningNormalOptions_toggled( bool state )</slot> -// <slot>kcfg_HashedControlPassword_textChanged( const QString & )</slot> +// <slot>kcfg_HashedControlPassword_textChanged( const TQString & )</slot> // <slot>kcfg_CookieAuthentication_toggled( bool )</slot> // <slot>kcfg_ClientOnly_toggled( bool state )</slot> // </slots> diff --git a/src/server.ui b/src/server.ui index c3df472..8076e47 100644 --- a/src/server.ui +++ b/src/server.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MyServer</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MyServer</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -53,7 +53,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_ClientOnly</cstring> </property> @@ -64,7 +64,7 @@ <string>Alt+E</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>ServerInfo</cstring> </property> @@ -83,7 +83,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout1</cstring> </property> @@ -91,7 +91,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>kcfg_NickName</cstring> </property> @@ -99,7 +99,7 @@ <number>20</number> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>kcfg_ContactInfo</cstring> </property> @@ -107,7 +107,7 @@ <number>40</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -115,7 +115,7 @@ <string>Contact Info:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -125,7 +125,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout2</cstring> </property> @@ -133,7 +133,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="1"> + <widget class="TQListView" row="0" column="1"> <column> <property name="text"> <string>CC</string> @@ -191,7 +191,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -199,7 +199,7 @@ <string>Delete Selected</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel7_2_2_2_3</cstring> </property> @@ -210,7 +210,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>layout5</cstring> </property> @@ -218,7 +218,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>kcfg_DirListenAddress</cstring> </property> @@ -229,7 +229,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -237,7 +237,7 @@ <string>Serve Tor Traffic on Local Port</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>kcfg_ORListenAddress</cstring> </property> @@ -248,7 +248,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -258,7 +258,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>kcfg_ForwardPorts</cstring> </property> @@ -269,7 +269,7 @@ <string>This will tell Tor to adverise your Tor server on the common ports 80 and 443, <br> it will also tell your router to forward traffic on these ports to Tor.</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>layout4</cstring> </property> @@ -291,7 +291,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_PublishServerDescriptor</cstring> </property> @@ -316,7 +316,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_MiddleMan</cstring> </property> @@ -327,7 +327,7 @@ <string>Alt+A</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_BridgeRelay</cstring> </property> @@ -358,7 +358,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -369,7 +369,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_DefaultServerPerformance</cstring> </property> @@ -414,7 +414,7 @@ </size> </property> </spacer> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>PerformanceOptions</cstring> </property> @@ -428,7 +428,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="0" column="4"> + <widget class="TQSpinBox" row="0" column="4"> <property name="name"> <cstring>kcfg_NumCPUs</cstring> </property> @@ -439,7 +439,7 @@ <number>1</number> </property> </widget> - <widget class="QSpinBox" row="1" column="4"> + <widget class="TQSpinBox" row="1" column="4"> <property name="name"> <cstring>kcfg_MaxOnionsPending</cstring> </property> @@ -450,7 +450,7 @@ <number>100</number> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -458,7 +458,7 @@ <string>Maximum number of encryption tasks to keep waiting:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -466,7 +466,7 @@ <string>Maximum number of simultaneous encryption tasks:</string> </property> </widget> - <widget class="QLabel" row="2" column="2" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -474,7 +474,7 @@ <string>every</string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -482,7 +482,7 @@ <string>When shutting down, wait at most: </string> </property> </widget> - <widget class="QSpinBox" row="3" column="3" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="3" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_ShutDownWaitLength</cstring> </property> @@ -493,7 +493,7 @@ <number>5000</number> </property> </widget> - <widget class="QComboBox" row="2" column="4"> + <widget class="TQComboBox" row="2" column="4"> <item> <property name="text"> <string>day</string> @@ -513,7 +513,7 @@ <cstring>AccountingStart</cstring> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>kcfg_AccountingMax</cstring> </property> @@ -521,7 +521,7 @@ <string> MBs p/s</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2_2</cstring> </property> @@ -529,7 +529,7 @@ <string>Never exceed </string> </property> </widget> - <widget class="QSpinBox" row="4" column="3" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="4" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_ConnLimit</cstring> </property> @@ -540,7 +540,7 @@ <number>9999</number> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel4_2_2_2</cstring> </property> @@ -552,7 +552,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ExitPolicies</cstring> </property> @@ -580,7 +580,7 @@ </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -599,7 +599,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel5_2</cstring> </property> @@ -608,7 +608,7 @@ <p><b>Use '0' as the port to specify 'all ports'. Use '*' as the address to specify 'all addresses'</b>.</p></string> </property> </widget> - <widget class="QListView" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQListView" row="0" column="1" rowspan="1" colspan="4"> <column> <property name="text"> <string>Policy</string> @@ -663,12 +663,12 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QSpinBox" row="1" column="3"> + <widget class="TQSpinBox" row="1" column="3"> <property name="name"> <cstring>SocksPort</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="4"> + <widget class="TQPushButton" row="1" column="4"> <property name="name"> <cstring>PushAdd2</cstring> </property> @@ -679,7 +679,7 @@ <string>Alt+K</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>accept</string> @@ -694,7 +694,7 @@ <cstring>Policy</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>SocksAddress</cstring> </property> @@ -727,9 +727,9 @@ </connection> <connection> <sender>ExitPolicy</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>MyServer</receiver> - <slot>ExitPolicy_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>ExitPolicy_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>pushButton2</sender> @@ -746,7 +746,7 @@ <slot>kcfg_MiddleMan_toggled( bool on )</slot> <slot>checkBox6_toggled( bool state )</slot> <slot>pushAdd2_clicked()</slot> - <slot>ExitPolicy_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>ExitPolicy_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> <slot>pushButton2_clicked()</slot> <slot>kcfg_BridgeRelay_toggled( bool on )</slot> diff --git a/src/server.ui.h b/src/server.ui.h index 19b083e..d46af71 100644 --- a/src/server.ui.h +++ b/src/server.ui.h @@ -23,8 +23,8 @@ #include "upnpmanager.h" #include <klocale.h> #include <kdebug.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kiconloader.h> #ifndef EXTERNAL_GEOIP @@ -43,26 +43,26 @@ void MyServer::init() if (UPnPManager::Manager()->routersDiscovered()) kcfg_ForwardPorts->setEnabled(true); - MyFamily->setSelectionMode( QListView::Extended ); - MyFamily->setColumnWidthMode(0, QListView::Manual); + MyFamily->setSelectionMode( TQListView::Extended ); + MyFamily->setColumnWidthMode(0, TQListView::Manual); MyFamily->hideColumn(0); MyFamily->header()->setResizeEnabled(FALSE, 0); - MyFamily->setColumnWidthMode(1, QListView::Manual); + MyFamily->setColumnWidthMode(1, TQListView::Manual); MyFamily->hideColumn(1); MyFamily->header()->setResizeEnabled(FALSE, 1); - MyFamily->setColumnWidthMode(2, QListView::Manual); + MyFamily->setColumnWidthMode(2, TQListView::Manual); MyFamily->hideColumn(2); MyFamily->header()->setResizeEnabled(FALSE, 2); - MyFamily->setResizeMode( QListView::LastColumn ); + MyFamily->setResizeMode( TQListView::LastColumn ); - QStringList existingServers = TorkConfig::myFamily(); - QListViewItem *tm; - QString fp; - QString nick; - QString geoipcc; - QString countryName; + TQStringList existingServers = TorkConfig::myFamily(); + TQListViewItem *tm; + TQString fp; + TQString nick; + TQString geoipcc; + TQString countryName; - for ( QStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) + for ( TQStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -74,15 +74,15 @@ void MyServer::init() nick = (*it).section("-",2); countryName = GeoIP_country_name[(geoipcc).toInt()]; - tm = new QListViewItem(MyFamily,countryName,geoipcc,fp,nick); - tm->setPixmap(3,QPixmap(SmallIcon("tork_" + QString(GeoIP_country_code[geoipcc.toInt()]).lower()))); + tm = new TQListViewItem(MyFamily,countryName,geoipcc,fp,nick); + tm->setPixmap(3,TQPixmap(SmallIcon("tork_" + TQString(GeoIP_country_code[geoipcc.toInt()]).lower()))); } ExitPolicy->setSorting(-1,false); - QStringList exitPolicy = TorkConfig::exitPolicy(); - for ( QStringList::Iterator it = exitPolicy.end(); ; --it ) + TQStringList exitPolicy = TorkConfig::exitPolicy(); + for ( TQStringList::Iterator it = exitPolicy.end(); ; --it ) { if ((it == exitPolicy.begin()) && ((*it).isEmpty())) break; @@ -90,11 +90,11 @@ void MyServer::init() if ((*it).isEmpty()) continue; - QString policy = (*it).section(" ",0,0); - QString section2 = (*it).section(" ",1,1); - QString ip = section2.section(":",0,0); - QString port = section2.section(":",1,1); - tm = new QListViewItem(ExitPolicy,policy, ip,port); + TQString policy = (*it).section(" ",0,0); + TQString section2 = (*it).section(" ",1,1); + TQString ip = section2.section(":",0,0); + TQString port = section2.section(":",1,1); + tm = new TQListViewItem(ExitPolicy,policy, ip,port); if (it == exitPolicy.begin()) break; @@ -152,20 +152,20 @@ void MyServer::checkBox6_toggled( bool state) void MyServer::pushAdd2_clicked() { - QString port; + TQString port; if (SocksPort->text() == "0") port = "*"; else port = SocksPort->text(); - new QListViewItem(ExitPolicy,Policy->text(0), SocksAddress->text(), port); + new TQListViewItem(ExitPolicy,Policy->text(0), SocksAddress->text(), port); } -void MyServer::ExitPolicy_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void MyServer::ExitPolicy_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( ExitPolicy ); + TQPopupMenu *menu = new TQPopupMenu( ExitPolicy ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -177,7 +177,7 @@ void MyServer::ExitPolicy_contextMenuRequested( QListViewItem *, const QPoint &p void MyServer::slotDeleteEntry( ) { - QListViewItemIterator it(ExitPolicy, QListViewItemIterator::Selected); + TQListViewItemIterator it(ExitPolicy, TQListViewItemIterator::Selected); while ( it.current() ) { if (ExitPolicy->isSelected( it.current())) delete it.current(); @@ -191,7 +191,7 @@ void MyServer::slotDeleteEntry( ) void MyServer::pushButton2_clicked() { - QListViewItemIterator it(MyFamily, QListViewItemIterator::Selected); + TQListViewItemIterator it(MyFamily, TQListViewItemIterator::Selected); while ( it.current() ) { delete it.current(); ++it; diff --git a/src/serverwizard.ui b/src/serverwizard.ui index 43cab96..ce896c2 100644 --- a/src/serverwizard.ui +++ b/src/serverwizard.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ServerWizard</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>ServerWizard</cstring> </property> @@ -15,7 +15,7 @@ <property name="caption"> <string>Tor Server Guide</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ServerName</cstring> </property> @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -37,7 +37,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -46,7 +46,7 @@ <p>Every Tor server has a nickname, for easy identification. It's not that important what you call it.</p></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -54,7 +54,7 @@ <string>Server NickName:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>serverName</cstring> </property> @@ -80,7 +80,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ContactInfo</cstring> </property> @@ -91,7 +91,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1_2</cstring> </property> @@ -102,7 +102,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -111,12 +111,12 @@ <p>You are not obliged to provide a contact email, but it will certainly help in the event of a problem.</p></string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>contactMail</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -145,7 +145,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>ServerReachability</cstring> </property> @@ -156,7 +156,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1_2_2</cstring> </property> @@ -167,7 +167,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2_2</cstring> </property> @@ -176,7 +176,7 @@ <p>If you want, TorK can contact your router and tell it to ensure anything that arrives on ports 80 and 443 is sent to Tor. If you'd like to do this, tick the box below if it is enabled..</p></string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -187,7 +187,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>ForwardPorts</cstring> </property> @@ -195,7 +195,7 @@ <string>Make Tor Easily Accessible.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>RoutersFound</cstring> </property> @@ -221,7 +221,7 @@ <signal>setUpServer( int )</signal> </signals> <slots> - <slot>showPage( QWidget * w )</slot> + <slot>showPage( TQWidget * w )</slot> <slot>setServerType( int id )</slot> <slot>accept()</slot> <slot>reject()</slot> diff --git a/src/serverwizard.ui.h b/src/serverwizard.ui.h index 3375298..20cc9e6 100644 --- a/src/serverwizard.ui.h +++ b/src/serverwizard.ui.h @@ -20,7 +20,7 @@ ***************************************************************************/ #include <kmessagebox.h> #include <kdebug.h> -#include <qstringlist.h> +#include <ntqstringlist.h> #include "tork.h" #include "torkconfig.h" #include "upnpmanager.h" @@ -37,13 +37,13 @@ void ServerWizard::init() displayDiscoveredRouters(); serverName->setText("TorKServer"); - KConfig emailConf( QString::fromLatin1("emaildefaults") ); - emailConf.setGroup(QString::fromLatin1("Defaults")); - QString profile = QString::fromLatin1("PROFILE_"); - profile += emailConf.readEntry(QString::fromLatin1("Profile"), QString::fromLatin1("Default")); + KConfig emailConf( TQString::fromLatin1("emaildefaults") ); + emailConf.setGroup(TQString::fromLatin1("Defaults")); + TQString profile = TQString::fromLatin1("PROFILE_"); + profile += emailConf.readEntry(TQString::fromLatin1("Profile"), TQString::fromLatin1("Default")); emailConf.setGroup(profile); - contactMail->setText(emailConf.readEntry(QString::fromLatin1("EmailAddress"))); + contactMail->setText(emailConf.readEntry(TQString::fromLatin1("EmailAddress"))); } @@ -53,10 +53,10 @@ void ServerWizard::displayDiscoveredRouters() ForwardPorts->setEnabled(true); ForwardPorts->setChecked(true); - QString routers; - QStringList routerList; + TQString routers; + TQStringList routerList; routerList = UPnPManager::Manager()->discoveredRoutersNameList(); - for ( QStringList::Iterator it = routerList.begin(); it != routerList.end(); ++it ) + for ( TQStringList::Iterator it = routerList.begin(); it != routerList.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -65,14 +65,14 @@ void ServerWizard::displayDiscoveredRouters() routers += "</b><br>"; } - QString routerText = i18n("Make Tor Accessible on the Following Routers:<p> %1").arg(routers); + TQString routerText = i18n("Make Tor Accessible on the Following Routers:<p> %1").arg(routers); RoutersFound->setText(routerText); } void -ServerWizard::showPage( QWidget *w ) //virtual +ServerWizard::showPage( TQWidget *w ) //virtual { - QWizard::showPage( w ); + TQWizard::showPage( w ); if (currentPage() == ServerReachability) @@ -94,12 +94,12 @@ ServerWizard::accept() TorkConfig::setForwardPorts(ForwardPorts->isChecked()); TorkConfig::writeConfig(); emit setUpServer(serverType); - QDialog::accept(); + TQDialog::accept(); } void ServerWizard::reject() { - QDialog::reject(); + TQDialog::reject(); } diff --git a/src/statgraph.cpp b/src/statgraph.cpp index 4313e5f..706f3a8 100644 --- a/src/statgraph.cpp +++ b/src/statgraph.cpp @@ -33,22 +33,22 @@ #include "statgraph.h" -#include <qpainter.h> -#include <qlabel.h> +#include <ntqpainter.h> +#include <ntqlabel.h> #include <kdebug.h> #define SOFT_STEP 3 -const QColor StatGraph::defaultBgColor = Qt::black; -const QColor StatGraph::defaultReadingColor = Qt::yellow; -const QColor StatGraph::defaultLabelColor = Qt::white; -const QColor StatGraph::defaultGridColor = Qt::lightGray; +const TQColor StatGraph::defaultBgColor = TQt::black; +const TQColor StatGraph::defaultReadingColor = TQt::yellow; +const TQColor StatGraph::defaultLabelColor = TQt::white; +const TQColor StatGraph::defaultGridColor = TQt::lightGray; /// Color used to pass transparent colors -//const QColor StatGraph::invalidColor = QColor(-1, -1, -1); +//const TQColor StatGraph::invalidColor = TQColor(-1, -1, -1); -StatGraph::StatGraph(QWidget *parent, ushort pace, ushort gridPace, const QString &label, const QColor &bgColor, const char *name) - : QLabel(parent, name), m_style(Shades), m_gridPace(gridPace), m_pace(pace) +StatGraph::StatGraph(TQWidget *parent, ushort pace, ushort gridPace, const TQString &label, const TQColor &bgColor, const char *name) + : TQLabel(parent, name), m_style(Shades), m_gridPace(gridPace), m_pace(pace) { setLabel(label); setBgColor(bgColor); @@ -64,7 +64,7 @@ StatGraph::~StatGraph() delete[] m_readings; } -void StatGraph::setBgColor(const QColor &color) +void StatGraph::setBgColor(const TQColor &color) { m_bgColor = color; @@ -72,7 +72,7 @@ void StatGraph::setBgColor(const QColor &color) setBackgroundColor(m_bgColor); } -inline void StatGraph::paintGrid(QPainter &p) +inline void StatGraph::paintGrid(TQPainter &p) { p.setPen(m_gridColor); @@ -85,7 +85,7 @@ inline void StatGraph::paintGrid(QPainter &p) } } -inline void StatGraph::paintShades(QPainter &p) +inline void StatGraph::paintShades(TQPainter &p) { //kdDebug() << "StatGraph::paintShades()" << endl; const uint graphHeight = height(); @@ -107,7 +107,7 @@ inline void StatGraph::paintShades(QPainter &p) } } -inline void StatGraph::paintBars(QPainter &p) +inline void StatGraph::paintBars(TQPainter &p) { //kdDebug() << "StatGraph::paintBars()" << endl; const uint graphHeight = height(); @@ -120,7 +120,7 @@ inline void StatGraph::paintBars(QPainter &p) } } -inline void StatGraph::paintLines(QPainter &p) +inline void StatGraph::paintLines(TQPainter &p) { //kdDebug() << "StatGraph::paintLines()" << endl; const uint graphHeight = height(); @@ -133,10 +133,10 @@ inline void StatGraph::paintLines(QPainter &p) } } -inline void StatGraph::paintLabel(QPainter &p) +inline void StatGraph::paintLabel(TQPainter &p) { //kdDebug() << "StatGraph::paintLabel()" << endl; - p.setFont(QFont("Helvetica", 8)); + p.setFont(TQFont("Helvetica", 8)); p.setPen(m_labelColor); p.drawText(rect(), AlignLeft | AlignTop, m_label); } @@ -174,9 +174,9 @@ void StatGraph::softenReadings(uint &reading) reading = old - SOFT_STEP; } -void StatGraph::resizeEvent(QResizeEvent *e) +void StatGraph::resizeEvent(TQResizeEvent *e) { - QLabel::resizeEvent(e); + TQLabel::resizeEvent(e); uint oldNumReadings = m_numReadings; m_numReadings = width() / m_pace; @@ -197,14 +197,14 @@ void StatGraph::resizeEvent(QResizeEvent *e) } } -void StatGraph::paintEvent(QPaintEvent *e) +void StatGraph::paintEvent(TQPaintEvent *e) { - QLabel::paintEvent(e); + TQLabel::paintEvent(e); if ( ! m_readingColor.isValid() ) m_readingColor = defaultReadingColor; if ( ! m_labelColor.isValid() ) m_labelColor = defaultLabelColor; if ( ! m_gridColor.isValid() ) m_gridColor = defaultGridColor; - QPainter p(this); + TQPainter p(this); if ( m_gridPace ) paintGrid(p); @@ -224,15 +224,15 @@ void StatGraph::paintEvent(QPaintEvent *e) paintLabel(p); } -void StatGraph::mousePressEvent(QMouseEvent *e) +void StatGraph::mousePressEvent(TQMouseEvent *e) { - QLabel::mousePressEvent(e); + TQLabel::mousePressEvent(e); m_button = e->button(); } -void StatGraph::mouseReleaseEvent(QMouseEvent *e) +void StatGraph::mouseReleaseEvent(TQMouseEvent *e) { - QLabel::mouseReleaseEvent(e); + TQLabel::mouseReleaseEvent(e); if ( m_button == e->button() ) { switch(m_button) @@ -247,7 +247,7 @@ void StatGraph::mouseReleaseEvent(QMouseEvent *e) kdDebug() << "Unknown button combination" << endl; } } - m_button = Qt::NoButton; + m_button = TQt::NoButton; } #include "statgraph.moc" diff --git a/src/statgraph.h b/src/statgraph.h index 40a9c26..2c526f5 100644 --- a/src/statgraph.h +++ b/src/statgraph.h @@ -34,10 +34,10 @@ #ifndef STATGRAPH_H #define STATGRAPH_H -#include <qobject.h> -#include <qstring.h> -#include <qcolor.h> -#include <qlabel.h> +#include <ntqobject.h> +#include <ntqstring.h> +#include <ntqcolor.h> +#include <ntqlabel.h> /** * @author Diego 'Flameeyes' Pettenò @@ -49,7 +49,7 @@ * system trays and so on. * */ -class StatGraph : public QLabel { +class StatGraph : public TQLabel { Q_OBJECT public: //@{ @@ -57,22 +57,22 @@ public: * @name defaultcolors Default graphs' colors * @brief These colors will be used as defaults color for graphs. */ - static const QColor defaultBgColor; - static const QColor defaultReadingColor; - static const QColor defaultLabelColor; - static const QColor defaultGridColor; - static const QColor invalidColor; ///< Color used to pass transparent colors + static const TQColor defaultBgColor; + static const TQColor defaultReadingColor; + static const TQColor defaultLabelColor; + static const TQColor defaultGridColor; + static const TQColor invalidColor; ///< Color used to pass transparent colors //@} enum Style { Lines, Bars, Shades }; protected: Style m_style; ///< Style of the graph - QString m_label; ///< Label to show on the graph (QString::null to not show label) + TQString m_label; ///< Label to show on the graph (TQString::null to not show label) - QColor m_bgColor; ///< Background color for the graph @see defaultBgColor - QColor m_readingColor; ///< Color for the readings graph - QColor m_labelColor; ///< Color for the graph's label (if any) - QColor m_gridColor; ///< Color for the graph's grid (if any) + TQColor m_bgColor; ///< Background color for the graph @see defaultBgColor + TQColor m_readingColor; ///< Color for the readings graph + TQColor m_labelColor; ///< Color for the graph's label (if any) + TQColor m_gridColor; ///< Color for the graph's grid (if any) ushort m_gridPace; ///< Pace at which a the grid is drawn. If 0, the grid is not drawn. ushort m_pace; ///< Horizontal pace for readings @@ -80,7 +80,7 @@ protected: uint m_currReading; ///< Current index in the readings arrays. uint *m_readings; ///< Array for readings. - Qt::ButtonState m_button; ///< Button clicked in pressed/released events + TQt::ButtonState m_button; ///< Button clicked in pressed/released events public: /** * @brief Constructor for a StatGraph instance @@ -88,16 +88,16 @@ public: * @param pace X-distance between two reads. This will also influence the number * of readings which can be added (label's width / pace) * @param gridPace Y-distance between two grid lines. If 0, the grid is not drawn. - * @param label Label to show on the graph (QString::null to not show label) + * @param label Label to show on the graph (TQString::null to not show label) * @param bgColor Background color to apply to the graph - * @param name Name of the statgraph instance (passed to QObject) + * @param name Name of the statgraph instance (passed to TQObject) * - * This constructor initialize the QObject parent class and the + * This constructor initialize the TQObject parent class and the * label which will be used to draw the graph on. * Note: it will @b not change the background of the label, nor it will draw * the label. */ - StatGraph(QWidget *parent, ushort pace = 1, ushort gridPace = 0, const QString &label = QString::null, const QColor &bgColor = defaultBgColor, const char *name = ""); + StatGraph(TQWidget *parent, ushort pace = 1, ushort gridPace = 0, const TQString &label = TQString::null, const TQColor &bgColor = defaultBgColor, const char *name = ""); virtual ~StatGraph(); @@ -108,35 +108,35 @@ public: { m_style = style; } protected: - virtual void resizeEvent(QResizeEvent*); - virtual void paintEvent(QPaintEvent*); - virtual void mousePressEvent(QMouseEvent *); - virtual void mouseReleaseEvent(QMouseEvent *); + virtual void resizeEvent(TQResizeEvent*); + virtual void paintEvent(TQPaintEvent*); + virtual void mousePressEvent(TQMouseEvent *); + virtual void mouseReleaseEvent(TQMouseEvent *); /** * @brief Paints the grid on the graph */ - void paintGrid(QPainter &p); + void paintGrid(TQPainter &p); /** * @brief Paints the graph using Shades style */ - void paintShades(QPainter &p); + void paintShades(TQPainter &p); /** * @brief Paints the graph using Bars style */ - void paintBars(QPainter &p); + void paintBars(TQPainter &p); /** * @brief Paints the graph using Lines style */ - void paintLines(QPainter &p); + void paintLines(TQPainter &p); /** * @brief Paints the label on the graph */ - void paintLabel(QPainter &p); + void paintLabel(TQPainter &p); /** * @brief Apply softening algorithm to readings @@ -158,9 +158,9 @@ public slots: * @brief Sets the label to show on the graph * * This function sets the string to show on the graph. - * To disable showLabel, simply pass QString::null as label to show. + * To disable showLabel, simply pass TQString::null as label to show. */ - inline void setLabel(const QString &label) + inline void setLabel(const TQString &label) { m_label = label; } @@ -171,7 +171,7 @@ public slots: * This function sets the background color for the graph instance * To set the background to transparent, simply pass invalidColor value. */ - void setBgColor(const QColor &color); + void setBgColor(const TQColor &color); /** * @brief Sets the reading color for the graph. @@ -180,7 +180,7 @@ public slots: * @note Passing invalidColor to this, made it move to the default color * as soon as a redraw is requested. */ - inline void setReadingColor(const QColor &color) + inline void setReadingColor(const TQColor &color) { m_readingColor = color; } /** @@ -190,7 +190,7 @@ public slots: * @note Passing invalidColor to this, made it move to the default color * as soon as a redraw is requested. */ - inline void setLabelColor(const QColor &color) + inline void setLabelColor(const TQColor &color) { m_labelColor = color; } /** @@ -200,7 +200,7 @@ public slots: * @note Passing invalidColor to this, made it move to the default color * as soon as a redraw is requested. */ - inline void setGridColor(const QColor &color) + inline void setGridColor(const TQColor &color) { m_gridColor = color; } /** diff --git a/src/testprivacyproxy.cpp b/src/testprivacyproxy.cpp index 7b03f44..fbf878d 100644 --- a/src/testprivacyproxy.cpp +++ b/src/testprivacyproxy.cpp @@ -20,29 +20,29 @@ ***************************************************************************/ -#include <qsocket.h> -#include <qtextstream.h> +#include <ntqsocket.h> +#include <ntqtextstream.h> #include "testprivacyproxy.h" #include "tork.h" #include "torkconfig.h" -#include <qtimer.h> +#include <ntqtimer.h> #include <klocale.h> #include <assert.h> -#include <qfile.h> +#include <ntqfile.h> #include <sys/socket.h> #include <netdb.h> #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> #include <kstandarddirs.h> -#include <qdir.h> +#include <ntqdir.h> TestPrivoxy::TestPrivoxy( ) { // create the socket and connect various of its signals - socket = new QSocket( this ); + socket = new TQSocket( this ); connect( socket, SIGNAL(connected()), SLOT(socketConnected()) ); connect( socket, SIGNAL(connectionClosed()), @@ -55,7 +55,7 @@ TestPrivoxy::TestPrivoxy( ) } -void TestPrivoxy::connectTo(const QString &host, Q_UINT16 port ) +void TestPrivoxy::connectTo(const TQString &host, TQ_UINT16 port ) { // connect to the server socket->connectToHost( host, port ); diff --git a/src/testprivacyproxy.h b/src/testprivacyproxy.h index c139edb..7f74c9a 100644 --- a/src/testprivacyproxy.h +++ b/src/testprivacyproxy.h @@ -21,7 +21,7 @@ ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file is part of an example program for Qt. This example +** This file is part of an example program for TQt. This example ** program may be used, distributed and modified without limitation. ** *****************************************************************************/ @@ -29,15 +29,15 @@ #ifndef _TESTPRIVACYPROXY_H_ #define _TESTPRIVACYPROXY_H_ -#include <qsocket.h> -#include <qtextstream.h> +#include <ntqsocket.h> +#include <ntqtextstream.h> #include <kdebug.h> #include <kconfigskeleton.h> -#include <qlistview.h> +#include <ntqlistview.h> #include "torkconfig.h" -class TestPrivoxy : public QObject +class TestPrivoxy : public TQObject { Q_OBJECT public: @@ -46,11 +46,11 @@ public: virtual ~TestPrivoxy(); - void sendToServer(const QString &string) + void sendToServer(const TQString &string) { if (!socket) return; - QTextStream os(socket); + TQTextStream os(socket); os << string << "\r\n"; } @@ -60,7 +60,7 @@ public slots: void closeConnection() { socket->close(); - if ( socket->state() == QSocket::Closing ) { + if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. connect( socket, SIGNAL(delayedCloseFinished()), SLOT(socketClosed()) ); @@ -70,7 +70,7 @@ public slots: } } - void connectTo(const QString &host, Q_UINT16 port); + void connectTo(const TQString &host, TQ_UINT16 port); signals: @@ -97,14 +97,14 @@ private slots: void socketError( int e ) { - if ( e == QSocket::ErrHostNotFound || - e == QSocket::ErrConnectionRefused ) + if ( e == TQSocket::ErrHostNotFound || + e == TQSocket::ErrConnectionRefused ) emit fatalError(); } private: - QSocket *socket; + TQSocket *socket; }; #endif // diff --git a/src/tor_ioslave/torioslave.cpp b/src/tor_ioslave/torioslave.cpp index 961b1d0..ac4a901 100644 --- a/src/tor_ioslave/torioslave.cpp +++ b/src/tor_ioslave/torioslave.cpp @@ -19,10 +19,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qcstring.h> -#include <qsocket.h> -#include <qdatetime.h> -#include <qbitarray.h> +#include <ntqcstring.h> +#include <ntqsocket.h> +#include <ntqdatetime.h> +#include <ntqbitarray.h> #include <stdlib.h> #include <math.h> @@ -53,7 +53,7 @@ using namespace KIO; -kio_torProtocol::kio_torProtocol(const QCString &pool_socket, const QCString &app_socket) +kio_torProtocol::kio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_tor", pool_socket, app_socket) { } @@ -67,13 +67,13 @@ kio_torProtocol::~kio_torProtocol() void kio_torProtocol::get(const KURL& url ) { - QString wait; - QByteArray output; + TQString wait; + TQByteArray output; - QTextStream os( output, IO_WriteOnly ); - os.setEncoding( QTextStream::Latin1 ); // In fast ASCII + TQTextStream os( output, IO_WriteOnly ); + os.setEncoding( TQTextStream::Latin1 ); // In fast ASCII - QString cleanedurl = url.prettyURL().replace("tor://",""); + TQString cleanedurl = url.prettyURL().replace("tor://",""); cleanedurl = cleanedurl.replace("tor:/",""); cleanedurl = cleanedurl.replace("tor:",""); cleanedurl = cleanedurl.replace(" ",""); @@ -87,7 +87,7 @@ void kio_torProtocol::get(const KURL& url ) if (cantdo){ - os << QString("<html><head><title>Tor</title></head><body>%1 is not a valid URL for this feature. Websites only I'm afraid. And no file extensions either!</body></html>").arg(cleanedurl); + os << TQString("<html><head><title>Tor</title></head><body>%1 is not a valid URL for this feature. Websites only I'm afraid. And no file extensions either!</body></html>").arg(cleanedurl); data( output ); finished(); @@ -119,7 +119,7 @@ void kio_torProtocol::get(const KURL& url ) }else{ KProcIO *whichproc = new KProcIO(); whichproc->setUseShell(TRUE); - QString whichCommand="tork --toggleKDE"; + TQString whichCommand="tork --toggleKDE"; *whichproc<<whichCommand; @@ -130,7 +130,7 @@ void kio_torProtocol::get(const KURL& url ) } - os << QString("<html><head><title>Tor</title><META HTTP-EQUIV='Refresh' CONTENT='%1; URL=%2'></head><body>Will load %3 anonymously in a moment.</body></html>").arg(wait).arg(cleanedurl).arg(cleanedurl); + os << TQString("<html><head><title>Tor</title><META HTTP-EQUIV='Refresh' CONTENT='%1; URL=%2'></head><body>Will load %3 anonymously in a moment.</body></html>").arg(wait).arg(cleanedurl).arg(cleanedurl); data( output ); finished(); diff --git a/src/tor_ioslave/torioslave.h b/src/tor_ioslave/torioslave.h index 05e90ca..0bb1556 100644 --- a/src/tor_ioslave/torioslave.h +++ b/src/tor_ioslave/torioslave.h @@ -22,19 +22,19 @@ #ifndef _tor_H_ #define _tor_H_ -#include <qstring.h> -#include <qcstring.h> +#include <ntqstring.h> +#include <ntqcstring.h> #include <kurl.h> #include <kio/global.h> #include <kio/slavebase.h> -class QCString; +class TQCString; class kio_torProtocol : public KIO::SlaveBase { public: - kio_torProtocol(const QCString &pool_socket, const QCString &app_socket); + kio_torProtocol(const TQCString &pool_socket, const TQCString &app_socket); virtual ~kio_torProtocol(); virtual void mimetype(const KURL& url); virtual void get(const KURL& url); diff --git a/src/torclient.cpp b/src/torclient.cpp index a29051a..1411076 100644 --- a/src/torclient.cpp +++ b/src/torclient.cpp @@ -20,27 +20,27 @@ ***************************************************************************/ -#include <qsocket.h> -#include <qtextstream.h> -#include <qstringlist.h> -#include <qregexp.h> +#include <ntqsocket.h> +#include <ntqtextstream.h> +#include <ntqstringlist.h> +#include <ntqregexp.h> #include "torclient.h" #include "tork.h" #include "torkconfig.h" #include "dndlistview.h" #include "functions.h" -#include <qtimer.h> +#include <ntqtimer.h> #include <klocale.h> #include <assert.h> -#include <qfile.h> +#include <ntqfile.h> #include <sys/socket.h> #include <netdb.h> #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> #include <kstandarddirs.h> -#include <qdir.h> +#include <ntqdir.h> #include "crypto.h" #ifndef EXTERNAL_GEOIP @@ -56,10 +56,10 @@ using namespace tk; -TorClient::TorClient( const QString &host, Q_UINT16 port ) +TorClient::TorClient( const TQString &host, TQ_UINT16 port ) { // create the socket and connect various of its signals - socket = new QSocket( this ); + socket = new TQSocket( this ); connect( socket, SIGNAL(connected()), SLOT(socketConnected()) ); connect( socket, SIGNAL(connectionClosed()), @@ -192,38 +192,38 @@ TorClient::TorClient( const QString &host, Q_UINT16 port ) void TorClient::configureServer( int orPort, int dirPort) { - sendToServer(QString("SETCONF ContactInfo=%1").arg(TorkConfig::contactInfo())) ; + sendToServer(TQString("SETCONF ContactInfo=%1").arg(TorkConfig::contactInfo())) ; - sendToServer(QString("SETCONF ClientOnly=%1").arg(TorkConfig::clientOnly())) ; + sendToServer(TQString("SETCONF ClientOnly=%1").arg(TorkConfig::clientOnly())) ; if (TorkConfig::middleMan()) - ( sendToServer(QString("SETCONF ExitPolicy=%1").arg(("\"reject *:*\"")))) ; + ( sendToServer(TQString("SETCONF ExitPolicy=%1").arg(("\"reject *:*\"")))) ; else - ( sendToServer(QString("SETCONF ExitPolicy=\"%2\"").arg( TorkConfig::exitPolicy().join(",")))); + ( sendToServer(TQString("SETCONF ExitPolicy=\"%2\"").arg( TorkConfig::exitPolicy().join(",")))); - sendToServer(QString("SETCONF NickName=%1").arg(TorkConfig::nickName())) ; + sendToServer(TQString("SETCONF NickName=%1").arg(TorkConfig::nickName())) ; if (!TorkConfig::clientOnly()){ //We send the orport configs together to avoid error messages from Tor //telling us that one cannot be set without the other. - sendToServer(QString("SETCONF ORPort=%1 " + sendToServer(TQString("SETCONF ORPort=%1 " "ORListenAddress=0.0.0.0:%2") .arg(orPort) .arg(TorkConfig::oRListenAddress())) ; //We send the dirport configs together to avoid error messages from Tor //telling us that one cannot be set without the other. - sendToServer(QString("SETCONF DIRPort=%1 " + sendToServer(TQString("SETCONF DIRPort=%1 " "DIRListenAddress=0.0.0.0:%2") .arg(dirPort) .arg(TorkConfig::dirListenAddress())) ; - sendToServer(QString("SETCONF BridgeRelay=%1").arg(TorkConfig::bridgeRelay())) ; - setBandwidth(QString("%1").arg(TorkConfig::bandwidthRate()), - QString("%1").arg(TorkConfig::bandwidthBurst()), - QString("%1").arg(TorkConfig::maxAdvertisedBandwidth())); + sendToServer(TQString("SETCONF BridgeRelay=%1").arg(TorkConfig::bridgeRelay())) ; + setBandwidth(TQString("%1").arg(TorkConfig::bandwidthRate()), + TQString("%1").arg(TorkConfig::bandwidthBurst()), + TQString("%1").arg(TorkConfig::maxAdvertisedBandwidth())); }else{ - sendToServer(QString("SETCONF ORPort= ORListenAddress=")) ; - sendToServer(QString("SETCONF DirPort= DirListenAddress=")) ; - sendToServer(QString("SETCONF BridgeRelay=")) ; + sendToServer(TQString("SETCONF ORPort= ORListenAddress=")) ; + sendToServer(TQString("SETCONF DirPort= DirListenAddress=")) ; + sendToServer(TQString("SETCONF BridgeRelay=")) ; } if (TorkConfig::clientOnly()) @@ -305,10 +305,10 @@ void TorClient::enableTransPort( bool set ) } -void TorClient::fetchServerInfo( const QString & server) +void TorClient::fetchServerInfo( const TQString & server) { - QString fp = getFPFromFPDigest(server); + TQString fp = getFPFromFPDigest(server); fp.replace("$",""); kdDebug() << fp << endl; @@ -317,11 +317,11 @@ void TorClient::fetchServerInfo( const QString & server) sendToServer("GETINFO dir/server/fp/" + fp); } -void TorClient::fetchServerInfoByNick( const QString & server) +void TorClient::fetchServerInfoByNick( const TQString & server) { - QString fp = getFPFromNickName(server); + TQString fp = getFPFromNickName(server); fp.replace("$",""); sendToServer("GETINFO dir/server/fp/" + fp); @@ -346,9 +346,9 @@ void TorClient::terminateTor() } -void TorClient::createService(const QString &dir, const QString &port) +void TorClient::createService(const TQString &dir, const TQString &port) { - sendToServer(QString("setconf hiddenservicedir=\"%1\" hiddenserviceport=\"%2\"").arg(dir).arg(port)); + sendToServer(TQString("setconf hiddenservicedir=\"%1\" hiddenserviceport=\"%2\"").arg(dir).arg(port)); } void TorClient::authenticate() @@ -362,18 +362,18 @@ void TorClient::authenticate() if (TorkConfig::cookieAuthentication()){ if (!readCookie()){ emit processQuestion("cookienotfound", - QString("Couldn't find authentication" + TQString("Couldn't find authentication" " cookie in %1/.tor!").arg(getenv("HOME"))); emit fatalError(); } }else if (!TorkConfig::hashedControlPassword().isEmpty()) - sendToServer(QString("AUTHENTICATE \"%1\"").arg(TorkConfig::hashedControlPassword())); + sendToServer(TQString("AUTHENTICATE \"%1\"").arg(TorkConfig::hashedControlPassword())); else{ sendToServer("AUTHENTICATE"); /* Lock the control port */ if (TorkConfig::generateRandomPassword()){ crypto_seed_rng(); - sendToServer(QString("setconf HashedControlPassword=16:%2") + sendToServer(TQString("setconf HashedControlPassword=16:%2") .arg(hashPassword(crypto_rand_string(16)))); } } @@ -384,25 +384,25 @@ void TorClient::authenticate() bool TorClient::readCookie() { - QString hex; + TQString hex; char hx[2]; - QStringList cookieCandidates; - cookieCandidates << QString("%1/.tor/control_auth_cookie").arg(getenv("HOME")); - cookieCandidates << QString("/var/lib/tor/control_auth_cookie"); + TQStringList cookieCandidates; + cookieCandidates << TQString("%1/.tor/control_auth_cookie").arg(getenv("HOME")); + cookieCandidates << TQString("/var/lib/tor/control_auth_cookie"); - for ( QStringList::Iterator it = cookieCandidates.begin(); it != cookieCandidates.end(); ++it ) { - QFile inf((*it)); + for ( TQStringList::Iterator it = cookieCandidates.begin(); it != cookieCandidates.end(); ++it ) { + TQFile inf((*it)); if ( inf.open(IO_ReadOnly) ) { - QByteArray array = inf.readAll(); + TQByteArray array = inf.readAll(); inf.close(); if (array.size() != 32) continue; for ( unsigned int i = 0; i < array.size(); i++ ) { sprintf(hx,"%02x",array[i]); - hex += QString(hx).right(2); + hex += TQString(hx).right(2); } - sendToServer(QString("AUTHENTICATE %1").arg(hex)); + sendToServer(TQString("AUTHENTICATE %1").arg(hex)); return true; } @@ -415,10 +415,10 @@ bool TorClient::readCookie() void TorClient::readRouters() { - QFile inf(QString("%1/.tor/cached-status/7EA6EAD6FD83083C538F44038BBFA077587DD755").arg(getenv("HOME"))); + TQFile inf(TQString("%1/.tor/cached-status/7EA6EAD6FD83083C538F44038BBFA077587DD755").arg(getenv("HOME"))); if ( inf.open(IO_ReadOnly) ) { - QTextStream stream( &inf ); - QString line; + TQTextStream stream( &inf ); + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' parseDirStatus(line); @@ -454,23 +454,23 @@ void TorClient::bandwidth() //interface when warned - but only for that session. m_portsToReject.clear(); m_portsToReject << "23" << "109" << "110" << "143"; - sendToServer(QString("SETCONF WarnPlainTextPorts=%1") + sendToServer(TQString("SETCONF WarnPlainTextPorts=%1") .arg(m_portsToReject.join(","))); - sendToServer(QString("SETCONF RejectPlainTextPorts=%1") + sendToServer(TQString("SETCONF RejectPlainTextPorts=%1") .arg(m_portsToReject.join(","))); sendToServer("SETEVENTS EXTENDED CIRC STREAM ORCONN NOTICE " "WARN ERR ADDRMAP BW STREAM_BW NS STATUS_GENERAL " "STATUS_CLIENT STATUS_SERVER GUARD"); - sendToServer(QString("SETCONF __ReloadTorrcOnSIGHUP=0")); + sendToServer(TQString("SETCONF __ReloadTorrcOnSIGHUP=0")); } -void TorClient::handle250(const QString &lin) +void TorClient::handle250(const TQString &lin) { - QString line = lin; + TQString line = lin; if ((line.contains("250-circuit-status="))){ if (line != ".") @@ -514,11 +514,11 @@ void TorClient::handle250(const QString &lin) else if (line.contains("250 MaxAdvertisedBandwidth=")) m_CurMaxAdvertisedBandwidth = line.section("=",1,1).toInt(); else if (line.contains("250 ExcludeNodes=")) - TorkConfig::setCurrentExcludeNodes(QStringList::split(",",line.replace("250 ExcludeNodes=",""))); + TorkConfig::setCurrentExcludeNodes(TQStringList::split(",",line.replace("250 ExcludeNodes=",""))); else if (line.contains("250 EntryNodes=")) - TorkConfig::setCurrentEntryNodes(QStringList::split(",",line.replace("250 EntryNodes=",""))); + TorkConfig::setCurrentEntryNodes(TQStringList::split(",",line.replace("250 EntryNodes=",""))); else if (line.contains("250 ExitNodes=")) - TorkConfig::setCurrentExitNodes(QStringList::split(",",line.replace("250 ExitNodes=",""))); + TorkConfig::setCurrentExitNodes(TQStringList::split(",",line.replace("250 ExitNodes=",""))); else if (line.contains("250-status/circuit-established=1")) updateClientReport("CIRCUIT_ESTABLISHED"); else if (line.contains("250-status/circuit-established=0")) @@ -529,19 +529,19 @@ void TorClient::handle250(const QString &lin) }else if (line.contains("250-status/enough-dir-info=0")) updateClientReport("NOT_ENOUGH_DIR_INFO"); else if (line.contains("250-status/good-server-descriptor=1")) - updateServerReport("GOOD_SERVER_DESCRIPTOR", QString()); + updateServerReport("GOOD_SERVER_DESCRIPTOR", TQString()); else if (line.contains("250-status/good-server-descriptor=0")) - updateServerReport("BAD_SERVER_DESCRIPTOR", QString()); + updateServerReport("BAD_SERVER_DESCRIPTOR", TQString()); else if (line.contains("250-status/reachability-succeeded/or=1")) - updateServerReport("REACHABILITY_SUCCEEDED", QString()); + updateServerReport("REACHABILITY_SUCCEEDED", TQString()); else if (line.contains("250-status/reachability-succeeded/or=0")) - updateServerReport("REACHABILITY_FAILED", QString()); + updateServerReport("REACHABILITY_FAILED", TQString()); } void TorClient::socketReadyRead() { - QString line; + TQString line; // read from the server while ( socket->canReadLine() ) { @@ -607,7 +607,7 @@ void TorClient::socketReadyRead() continue; } - QString code = line.left(3); + TQString code = line.left(3); if (code == "250") handle250(line); @@ -616,20 +616,20 @@ void TorClient::socketReadyRead() m_expectingDirStatus= true; continue; } - QString eventType = line.section(" ",1,1); - QString eventInfo = line.section(" ",2); + TQString eventType = line.section(" ",1,1); + TQString eventInfo = line.section(" ",2); if (eventInfo.contains("circuit_testing_failed")) emit serverError(); parseEvent(eventType,eventInfo); }else if (code == "552"){ - QString eventInfo = line.section(" ",1); + TQString eventInfo = line.section(" ",1); emit displayError("Sorry!", eventInfo); }else if (code == "514"){ - QString eventInfo = line.section(" ",1); + TQString eventInfo = line.section(" ",1); emit processWarning("authenticationrequired", eventInfo); emit fatalError(); }else if (code == "515"){ - QString eventInfo = line.section(" ",1); + TQString eventInfo = line.section(" ",1); if (eventInfo.contains("Wrong length")) emit processQuestion("cookierequired", eventInfo); else{ @@ -646,7 +646,7 @@ void TorClient::socketReadyRead() } } -void TorClient::parseEvent(const QString &type, const QString &info) +void TorClient::parseEvent(const TQString &type, const TQString &info) { if (info.isEmpty()) @@ -680,11 +680,11 @@ void TorClient::parseEvent(const QString &type, const QString &info) parseInfo(type,info); } -void TorClient::parseStatusGeneral(const QString &info) +void TorClient::parseStatusGeneral(const TQString &info) { - QString severity = info.section(" ",0,0); - QString action = info.section(" ",1,1); - QString message = statusMessage[action]; + TQString severity = info.section(" ",0,0); + TQString action = info.section(" ",1,1); + TQString message = statusMessage[action]; if (!serverStatus[action].isEmpty()) updateServerReport(action, info); @@ -706,14 +706,14 @@ void TorClient::parseStatusGeneral(const QString &info) } -void TorClient::populateMessageFromStatusDetail(const QString &line, QString &message) +void TorClient::populateMessageFromStatusDetail(const TQString &line, TQString &message) { - QRegExp rx("[\\sA-Z0-9]+[=]([\\-\\:\\.\\(\\)a-zA-Z0-9]+|\\\"[\\-\\.\\,a-zA-Z0-9\\s]+\\\")"); + TQRegExp rx("[\\sA-Z0-9]+[=]([\\-\\:\\.\\(\\)a-zA-Z0-9]+|\\\"[\\-\\.\\,a-zA-Z0-9\\s]+\\\")"); int pos = 0; while ( (pos = rx.search(line, pos)) != -1 ) { /* kdDebug() << rx.cap(0) << endl;*/ - QString keyword = rx.cap(0).section("=",0,0).stripWhiteSpace(); - QString value = rx.cap(0).section("=",1,1).stripWhiteSpace(); + TQString keyword = rx.cap(0).section("=",0,0).stripWhiteSpace(); + TQString value = rx.cap(0).section("=",1,1).stripWhiteSpace(); message.replace(keyword,value); pos += rx.matchedLength(); if (keyword=="PORT"){ @@ -723,7 +723,7 @@ void TorClient::populateMessageFromStatusDetail(const QString &line, QString &me } } -void TorClient::updateServerReport(const QString &message, const QString &info) +void TorClient::updateServerReport(const TQString &message, const TQString &info) { // kdDebug() << serverStatusIcon[message] << endl; // kdDebug() << message << endl; @@ -737,10 +737,10 @@ void TorClient::updateServerReport(const QString &message, const QString &info) emit updateTrayIcon(serverStatusIcon[message]); serverReport.remove("<font color='#990000'>Status Not Known</font>"); - QString msg = serverStatus[message]; + TQString msg = serverStatus[message]; if (message.contains("EXTERNAL_ADDRESS")){ - for ( QStringList::Iterator it = serverReport.begin(); it != serverReport.end(); ++it ) + for ( TQStringList::Iterator it = serverReport.begin(); it != serverReport.end(); ++it ) { // XXX Fixme if ((*it).contains("Using Address")){ @@ -762,7 +762,7 @@ void TorClient::updateServerReport(const QString &message, const QString &info) serverReport.append(msg); } -void TorClient::updateClientReport(const QString &message) +void TorClient::updateClientReport(const TQString &message) { if (!clientStatusIcon[message].isEmpty() && (TorkConfig::clientOnly())) emit updateTrayIcon(clientStatusIcon[clientStatus[message]]); @@ -775,38 +775,38 @@ void TorClient::resetClientReport() emit updateTrayIcon(clientStatusIcon[clientReport.first()]); } -void TorClient::parseBW(const QString &info) +void TorClient::parseBW(const TQString &info) { - QString in = info.section(" ",0,0); - QString out = info.section(" ",1,1); + TQString in = info.section(" ",0,0); + TQString out = info.section(" ",1,1); emit bwUpdate(in, out); } -void TorClient::parseStreamBW(const QString &info) +void TorClient::parseStreamBW(const TQString &info) { - QString stream = info.section(" ",0,0); + TQString stream = info.section(" ",0,0); /* Tor spec had it wrong way round! */ - QString out = info.section(" ",1,1); - QString in = info.section(" ",2,2); + TQString out = info.section(" ",1,1); + TQString in = info.section(" ",2,2); emit streamBwUpdate(stream, in, out); } -void TorClient::parseStream(const QString &info) +void TorClient::parseStream(const TQString &info) { - QString streamID = info.section(" ",0,0); - QString status = info.section(" ",1,1); - QString circID = info.section(" ",2,2); - QString Target = info.section(" ",3,3); + TQString streamID = info.section(" ",0,0); + TQString status = info.section(" ",1,1); + TQString circID = info.section(" ",2,2); + TQString Target = info.section(" ",3,3); //We ignore REMAPs because we don't do anything with them if (status == "REMAP") @@ -816,13 +816,13 @@ void TorClient::parseStream(const QString &info) } -void TorClient::parseServer(const QString &info) +void TorClient::parseServer(const TQString &info) { kdDebug() << "server info " << info << endl; if (info.left(7) == "router "){ - QString ip = info.section(" ",2,2); - QString cc; + TQString ip = info.section(" ",2,2); + TQString cc; GeoIP * gi = 0; @@ -859,11 +859,11 @@ void TorClient::parseServer(const QString &info) }else if (info.left(6) == "uptime"){ //from the clever ktorrent KLocale* loc = KGlobal::locale(); - QTime t; + TQTime t; int nsecs = info.section(" ",1).toInt(); int ndays = (nsecs) / 86400; t = t.addSecs(nsecs % 86400); - QString s = loc->formatTime(t,true,true); + TQString s = loc->formatTime(t,true,true); if (ndays > 0) s = i18n("1 day ","%n days ",ndays) + s; @@ -871,14 +871,14 @@ void TorClient::parseServer(const QString &info) }else if (info.left(20).contains("write-history")){ - QStringList bwlist = QStringList::split(",",info.section(" ",-1)); + TQStringList bwlist = TQStringList::split(",",info.section(" ",-1)); - QValueList<int> bws; + TQValueList<int> bws; bws << 4 << 24 << 48 << bwlist.count(); - QString bwup; - QString avgbw; - for ( QValueList<int>::Iterator it = bws.begin(); it != bws.end(); ++it ){ + TQString bwup; + TQString avgbw; + for ( TQValueList<int>::Iterator it = bws.begin(); it != bws.end(); ++it ){ avgbw = calcBW(bwlist, (*it)); for (int i = avgbw.length(); i < 14; i++) avgbw.append(" "); @@ -890,13 +890,13 @@ void TorClient::parseServer(const QString &info) m_statustiptmp.replace("$INTERVALTIME", info.section(" ",2,3)); }else if (info.left(20).contains("read-history")){ - QStringList bwlist = QStringList::split(",",info.section(" ",-1)); - QValueList<int> bws; + TQStringList bwlist = TQStringList::split(",",info.section(" ",-1)); + TQValueList<int> bws; bws << 4 << 24 << 48 << bwlist.count(); - QString bwup; - QString avgbw; - for ( QValueList<int>::Iterator it = bws.begin(); it != bws.end(); ++it ){ + TQString bwup; + TQString avgbw; + for ( TQValueList<int>::Iterator it = bws.begin(); it != bws.end(); ++it ){ avgbw = calcBW(bwlist, (*it)); for (int i = avgbw.length(); i < 14; i++) avgbw.append(" "); @@ -926,12 +926,12 @@ void TorClient::parseServer(const QString &info) } } -void TorClient::parseAddrmap(const QString &info) +void TorClient::parseAddrmap(const TQString &info) { - QString type = info.section(" ",0,0); - QString address = info.section(" ",1,1); + TQString type = info.section(" ",0,0); + TQString address = info.section(" ",1,1); // If this is a request to resolve a hostname/address from the traffic // logs @@ -955,33 +955,33 @@ void TorClient::parseAddrmap(const QString &info) } -void TorClient::parseGuards(const QString &info) +void TorClient::parseGuards(const TQString &info) { - QString fp_identity = info.section(" ",0,0); - QString status = info.section(" ",1,1); - QRegExp rx("(\\$[A-Z0-9]{40})"); + TQString fp_identity = info.section(" ",0,0); + TQString status = info.section(" ",1,1); + TQRegExp rx("(\\$[A-Z0-9]{40})"); rx.search(fp_identity); - QString server = getNickNameFromFP(rx.cap(0)); + TQString server = getNickNameFromFP(rx.cap(0)); if (!server.isEmpty()){ emit guardStatusUpdate(server, status); } } -void TorClient::parseCircuit(const QString &info) +void TorClient::parseCircuit(const TQString &info) { if (info.contains("FAILED")) emit displayError("Circuit Failed - "+info.section(" ",3,3).replace("REASON=",""), "Circuit: " + info.section(" ",2,2)); - QString circuitID = info.section(" ",0,0).stripWhiteSpace(); - QString status = info.section(" ",1,1).stripWhiteSpace(); - QString path = info.section(" ",2,2).stripWhiteSpace(); + TQString circuitID = info.section(" ",0,0).stripWhiteSpace(); + TQString status = info.section(" ",1,1).stripWhiteSpace(); + TQString path = info.section(" ",2,2).stripWhiteSpace(); //Get the FP Digest (if any) of the last server in the circuit - QString exit; - QRegExp rx("(\\$[A-Z0-9]{40})"); + TQString exit; + TQRegExp rx("(\\$[A-Z0-9]{40})"); int count = 0; int pos = 0; while ( (pos = rx.search(path, pos)) != -1 ) { @@ -992,49 +992,49 @@ void TorClient::parseCircuit(const QString &info) if (!exit.isEmpty()) exit = getFPDigestFromFP(exit); //Strip out the FPs from the circuit, if any - path.replace(QRegExp("(\\$[A-Z0-9]{40})(~|=)"),""); + path.replace(TQRegExp("(\\$[A-Z0-9]{40})(~|=)"),""); emit circuitStatusUpdate(circuitID, status, path, exit); } -void TorClient::parseORConn(const QString &info) +void TorClient::parseORConn(const TQString &info) { - QString serverID = info.section(" ",0,0); - QString status = info.section(" ",1,1); + TQString serverID = info.section(" ",0,0); + TQString status = info.section(" ",1,1); if (serverID.startsWith("$")){ - QString server = getNickNameFromFP(serverID); + TQString server = getNickNameFromFP(serverID); if (!server.isEmpty()) serverID = server; } if (!status.contains("NEW")){ - serverID.replace(QRegExp("^[A-Z0-9$=~]{42}"),""); + serverID.replace(TQRegExp("^[A-Z0-9$=~]{42}"),""); emit ORStatusUpdate(serverID, status); } } -void TorClient::parseInfo(const QString &type,const QString &info) +void TorClient::parseInfo(const TQString &type,const TQString &info) { - QString message = info; - message.replace(QRegExp("^[a-zA-Z0-9_]+\\(\\):"),""); -// QString summary = info.section(":",0,0); -// QString data = info.section(":",1); + TQString message = info; + message.replace(TQRegExp("^[a-zA-Z0-9_]+\\(\\):"),""); +// TQString summary = info.section(":",0,0); +// TQString data = info.section(":",1); if (info.contains("Servers unavailable")) emit displayServer("Server Info", "<b>Server appears to be down!</b>"); - emit infoUpdate(type, message, QString()); + emit infoUpdate(type, message, TQString()); } -void TorClient::updateCandidateServers(const QString &path) +void TorClient::updateCandidateServers(const TQString &path) { - QStringList servers = QStringList::split(",", path); - QStringList existingServers = TorkConfig::serversHistory(); - for ( QStringList::Iterator it = servers.begin(); it != servers.end(); ++it ) + TQStringList servers = TQStringList::split(",", path); + TQStringList existingServers = TorkConfig::serversHistory(); + for ( TQStringList::Iterator it = servers.begin(); it != servers.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -1046,26 +1046,26 @@ void TorClient::updateCandidateServers(const QString &path) TorkConfig::writeConfig(); } -void TorClient::attemptAttach(const QString &circid, const QString &streamid) +void TorClient::attemptAttach(const TQString &circid, const TQString &streamid) { - QStringList streams = QStringList::split( " ", streamid); - for ( QStringList::Iterator it = streams.begin(); it != streams.end(); ++it ) + TQStringList streams = TQStringList::split( " ", streamid); + for ( TQStringList::Iterator it = streams.begin(); it != streams.end(); ++it ) { if ((*it).isEmpty()) continue; - sendToServer(QString("ATTACHSTREAM %1 %2").arg(*it).arg(circid)); + sendToServer(TQString("ATTACHSTREAM %1 %2").arg(*it).arg(circid)); } } -void TorClient::attemptExtendCircuit(const QString &circid, const QString &serverlist, bool usefp) +void TorClient::attemptExtendCircuit(const TQString &circid, const TQString &serverlist, bool usefp) { - QStringList servers = QStringList::split( " ", serverlist); - QStringList circuitlist; - for ( QStringList::Iterator it = servers.begin(); it != servers.end(); ++it ) + TQStringList servers = TQStringList::split( " ", serverlist); + TQStringList circuitlist; + for ( TQStringList::Iterator it = servers.begin(); it != servers.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -1075,16 +1075,16 @@ void TorClient::attemptExtendCircuit(const QString &circid, const QString &serve circuitlist.append((*it)); } - QString circuit = circuitlist.join(","); - sendToServer(QString("EXTENDCIRCUIT %1 %2").arg(circid).arg(circuit)); + TQString circuit = circuitlist.join(","); + sendToServer(TQString("EXTENDCIRCUIT %1 %2").arg(circid).arg(circuit)); } -void TorClient::attemptCreateCircuit(const QString &serverlist, bool usefp) +void TorClient::attemptCreateCircuit(const TQString &serverlist, bool usefp) { - QStringList servers = QStringList::split( " ", serverlist); - QStringList circuitlist; - for ( QStringList::Iterator it = servers.begin(); it != servers.end(); ++it ) + TQStringList servers = TQStringList::split( " ", serverlist); + TQStringList circuitlist; + for ( TQStringList::Iterator it = servers.begin(); it != servers.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -1094,23 +1094,23 @@ void TorClient::attemptCreateCircuit(const QString &serverlist, bool usefp) circuitlist.append((*it)); } - QString circuit = circuitlist.join(","); - sendToServer(QString("EXTENDCIRCUIT 0 %1").arg(circuit)); + TQString circuit = circuitlist.join(","); + sendToServer(TQString("EXTENDCIRCUIT 0 %1").arg(circuit)); } -void TorClient::attemptCloseStream(const QString &streamid) +void TorClient::attemptCloseStream(const TQString &streamid) { - sendToServer(QString("CLOSESTREAM %1 1").arg(streamid)); + sendToServer(TQString("CLOSESTREAM %1 1").arg(streamid)); } void TorClient::attemptAttachStreams( bool attachStreams) { - sendToServer(QString("SETCONF __LeaveStreamsUnattached=%1").arg(attachStreams)); + sendToServer(TQString("SETCONF __LeaveStreamsUnattached=%1").arg(attachStreams)); } -void TorClient::attemptCloseCircuit(const QString &circuitid) +void TorClient::attemptCloseCircuit(const TQString &circuitid) { - sendToServer(QString("CLOSECIRCUIT %1").arg(circuitid)); + sendToServer(TQString("CLOSECIRCUIT %1").arg(circuitid)); } @@ -1150,7 +1150,7 @@ void TorClient::applySettingsToRunningTor() if (elementShouldBeUsed((*it))){ if (noSpecialProcessing((*it))){ PrevConfig::PrevConfigList::iterator mit; - QVariant oldvalue; + TQVariant oldvalue; for( mit = m_previtems.begin(); mit != m_previtems.end(); ++mit ) { if ((*mit).name() == (*it)->name()){ oldvalue = (*mit).property(); @@ -1159,21 +1159,21 @@ void TorClient::applySettingsToRunningTor() } - if ( (*it)->property().type() == QVariant::String ) { + if ( (*it)->property().type() == TQVariant::String ) { if ((oldvalue !=(*it)->property())){ - ( sendToServer(QString("SETCONF %1=%2").arg((*it)->name()).arg((*it)->property().toString()))); + ( sendToServer(TQString("SETCONF %1=%2").arg((*it)->name()).arg((*it)->property().toString()))); } - }else if ( (*it)->property().type() == QVariant::StringList ) { + }else if ( (*it)->property().type() == TQVariant::StringList ) { if ((oldvalue !=(*it)->property())){ - ( sendToServer(QString("SETCONF %1=\"%2\"").arg((*it)->name()).arg( (*it)->property().toStringList().join(",")))); + ( sendToServer(TQString("SETCONF %1=\"%2\"").arg((*it)->name()).arg( (*it)->property().toStringList().join(",")))); } - }else if ( (*it)->property().type() == QVariant::Int ) { + }else if ( (*it)->property().type() == TQVariant::Int ) { if ((oldvalue !=(*it)->property())){ - ( sendToServer(QString("SETCONF %1=%2").arg((*it)->name()).arg( (*it)->property().toString()))); + ( sendToServer(TQString("SETCONF %1=%2").arg((*it)->name()).arg( (*it)->property().toString()))); } - }else if ( (*it)->property().type() == QVariant::Bool ) { + }else if ( (*it)->property().type() == TQVariant::Bool ) { if ((oldvalue !=(*it)->property())){ - ( sendToServer(QString("SETCONF %1=%2").arg((*it)->name()).arg( (*it)->property().toInt()))); + ( sendToServer(TQString("SETCONF %1=%2").arg((*it)->name()).arg( (*it)->property().toInt()))); } } @@ -1183,33 +1183,33 @@ void TorClient::applySettingsToRunningTor() if (TorkConfig::useProxy()){ if ((TorkConfig::httpProxyPort() > 0) && (!TorkConfig::httpProxyHost().isEmpty())) - ( sendToServer(QString("SETCONF HttpProxy=%1:%2").arg(TorkConfig::httpProxyHost()).arg(TorkConfig::httpProxyPort()))) ; + ( sendToServer(TQString("SETCONF HttpProxy=%1:%2").arg(TorkConfig::httpProxyHost()).arg(TorkConfig::httpProxyPort()))) ; if ((TorkConfig::httpsProxyPort() > 0) && (!TorkConfig::httpsProxyHost().isEmpty())) - ( sendToServer(QString("SETCONF HttpsProxy=%1:%2").arg(TorkConfig::httpsProxyHost()).arg(TorkConfig::httpsProxyPort()))) ; + ( sendToServer(TQString("SETCONF HttpsProxy=%1:%2").arg(TorkConfig::httpsProxyHost()).arg(TorkConfig::httpsProxyPort()))) ; if ((!TorkConfig::httpProxyAuthenticatorUserName().isEmpty()) && (!TorkConfig::httpProxyAuthenticatorPassword().isEmpty())) - ( sendToServer(QString("SETCONF HttpProxyAuthenticator=%1:%2").arg(TorkConfig::httpProxyAuthenticatorUserName()).arg(TorkConfig::httpProxyAuthenticatorPassword()))); + ( sendToServer(TQString("SETCONF HttpProxyAuthenticator=%1:%2").arg(TorkConfig::httpProxyAuthenticatorUserName()).arg(TorkConfig::httpProxyAuthenticatorPassword()))); if ((!TorkConfig::httpsProxyAuthenticatorUserName().isEmpty()) && (!TorkConfig::httpsProxyAuthenticatorPassword().isEmpty())) - ( sendToServer(QString("SETCONF HttpsProxyAuthenticator=%1:%2").arg(TorkConfig::httpsProxyAuthenticatorUserName() ).arg(TorkConfig::httpsProxyAuthenticatorPassword()))); + ( sendToServer(TQString("SETCONF HttpsProxyAuthenticator=%1:%2").arg(TorkConfig::httpsProxyAuthenticatorUserName() ).arg(TorkConfig::httpsProxyAuthenticatorPassword()))); }else{ - ( sendToServer(QString("SETCONF HttpProxy="))); - ( sendToServer(QString("SETCONF HttpsProxy="))); - ( sendToServer(QString("SETCONF HttpProxyAuthenticator="))); - ( sendToServer(QString("SETCONF HttpsProxyAuthenticator="))); + ( sendToServer(TQString("SETCONF HttpProxy="))); + ( sendToServer(TQString("SETCONF HttpsProxy="))); + ( sendToServer(TQString("SETCONF HttpProxyAuthenticator="))); + ( sendToServer(TQString("SETCONF HttpsProxyAuthenticator="))); } if ((!TorkConfig::sOCKSBindAddressHost().isEmpty()) && (TorkConfig::sOCKSBindAddressPort() > -1)) - ( sendToServer(QString("SETCONF SOCKSListenAddress=%1:%2").arg(TorkConfig::sOCKSBindAddressHost()).arg( TorkConfig::sOCKSBindAddressPort()))) ; + ( sendToServer(TQString("SETCONF SOCKSListenAddress=%1:%2").arg(TorkConfig::sOCKSBindAddressHost()).arg( TorkConfig::sOCKSBindAddressPort()))) ; if ((TorkConfig::sOCKSBindAddressHost().isEmpty()) && (TorkConfig::sOCKSBindAddressPort() > -1)) - ( sendToServer(QString("SETCONF SOCKSPort=%2").arg(TorkConfig::sOCKSBindAddressPort()))) ; + ( sendToServer(TQString("SETCONF SOCKSPort=%2").arg(TorkConfig::sOCKSBindAddressPort()))) ; emit copyOldConfig(); emit makeTorkStoppable(); - sendToServer(QString("GETCONF ExcludeNodes")) ; - sendToServer(QString("GETCONF ExitNodes")) ; - sendToServer(QString("GETCONF EntryNodes")) ; + sendToServer(TQString("GETCONF ExcludeNodes")) ; + sendToServer(TQString("GETCONF ExitNodes")) ; + sendToServer(TQString("GETCONF EntryNodes")) ; } @@ -1243,7 +1243,7 @@ bool TorClient::noSpecialProcessing(const KConfigSkeletonItem* it) { if (((*it).name() == "PublishServerDescriptor") && (TorkConfig::bridgeRelay())){ - sendToServer(QString("setconf PublishServerDescriptor=bridge")); + sendToServer(TQString("setconf PublishServerDescriptor=bridge")); return false; } @@ -1252,7 +1252,7 @@ bool TorClient::noSpecialProcessing(const KConfigSkeletonItem* it) (!TorkConfig::cookieAuthentication()) && TorkConfig::generateRandomPassword()){ crypto_seed_rng(); - sendToServer(QString("setconf %1=16:%2") + sendToServer(TQString("setconf %1=16:%2") .arg((*it).name()) .arg(hashPassword(crypto_rand_string(16)))); return false; @@ -1262,50 +1262,50 @@ bool TorClient::noSpecialProcessing(const KConfigSkeletonItem* it) if ((*it).group() == "DefaultServerAddress"){ if ((*it).name() == "ORPort") - ( sendToServer(QString("SETCONF %1=%2").arg((*it).name()) + ( sendToServer(TQString("SETCONF %1=%2").arg((*it).name()) .arg( (*it).property().toString()))); return false; } if (((*it).name() == "BandwidthBurst") || ((*it).name() == "BandwidthRate")){ - ( sendToServer(QString("SETCONF BandwidthBurst=%1KB BandwidthRate=%2KB") + ( sendToServer(TQString("SETCONF BandwidthBurst=%1KB BandwidthRate=%2KB") .arg(TorkConfig::bandwidthBurst()).arg(TorkConfig::bandwidthRate()))); getBandwidth(); return false; } if ((*it).name() == "MaxAdvertisedBandwidth"){ - ( sendToServer(QString("SETCONF %1=%2KB").arg((*it).name()).arg( (*it).property().toString()))); + ( sendToServer(TQString("SETCONF %1=%2KB").arg((*it).name()).arg( (*it).property().toString()))); getBandwidth(); return false; } if ((*it).name() == "AccountingMax"){ - ( sendToServer(QString("SETCONF %1=\"%2 bytes\"").arg((*it).name()).arg( ((*it).property().toInt() * 1024 * 1024)))); + ( sendToServer(TQString("SETCONF %1=\"%2 bytes\"").arg((*it).name()).arg( ((*it).property().toInt() * 1024 * 1024)))); return false; } if ((*it).name() == "AccountingStart"){ if ((*it).property().toString() == "day") - ( sendToServer(QString("SETCONF %1=\"%2 00:00\"").arg((*it).name()).arg( (*it).property().toString()))); + ( sendToServer(TQString("SETCONF %1=\"%2 00:00\"").arg((*it).name()).arg( (*it).property().toString()))); else - ( sendToServer(QString("SETCONF %1=\"%2 1 00:00\"").arg((*it).name()).arg( (*it).property().toString()))); + ( sendToServer(TQString("SETCONF %1=\"%2 1 00:00\"").arg((*it).name()).arg( (*it).property().toString()))); return false; } if ((*it).name() == "KeepalivePeriod"){ if (!TorkConfig::reachableAddresses().isEmpty()){ - ( sendToServer(QString("SETCONF %1=%2").arg((*it).name()).arg( ((*it).property().toInt() * 60)))) ; + ( sendToServer(TQString("SETCONF %1=%2").arg((*it).name()).arg( ((*it).property().toInt() * 60)))) ; } return false; } if ((*it).name() == "TrackHostExits"){ if (!TorkConfig::trackHostExits().isEmpty()){ - ( sendToServer(QString("SETCONF %1=%2").arg((*it).name()).arg( ((*it).property().toStringList().join(","))))) ; + ( sendToServer(TQString("SETCONF %1=%2").arg((*it).name()).arg( ((*it).property().toStringList().join(","))))) ; if (TorkConfig::trackHostExitsExpire() > 0) - ( sendToServer(QString("SETCONF TrackHostExitsExpire=%2").arg((TorkConfig::trackHostExitsExpire() * 60)))) ; + ( sendToServer(TQString("SETCONF TrackHostExitsExpire=%2").arg((TorkConfig::trackHostExitsExpire() * 60)))) ; } return false; } @@ -1314,12 +1314,12 @@ bool TorClient::noSpecialProcessing(const KConfigSkeletonItem* it) if ((*it).name() == "SOCKSBindAddressMany"){ if (!TorkConfig::sOCKSBindAddressMany().isEmpty()){ - QStringList socksbind = TorkConfig::sOCKSBindAddressMany(); - for ( QStringList::Iterator it = (socksbind).begin(); it != (socksbind).end(); it++ ) + TQStringList socksbind = TorkConfig::sOCKSBindAddressMany(); + for ( TQStringList::Iterator it = (socksbind).begin(); it != (socksbind).end(); it++ ) { if ((*it).isEmpty()) continue; - ( sendToServer(QString("SETCONF SOCKSListenAddress=%2").arg((*it)))) ; + ( sendToServer(TQString("SETCONF SOCKSListenAddress=%2").arg((*it)))) ; } } return false; @@ -1327,83 +1327,83 @@ bool TorClient::noSpecialProcessing(const KConfigSkeletonItem* it) if ((*it).name() == "ExitPolicy"){ if (TorkConfig::middleMan()) - ( sendToServer(QString("SETCONF ExitPolicy=%1").arg(("\"reject *:*\"")))) ; + ( sendToServer(TQString("SETCONF ExitPolicy=%1").arg(("\"reject *:*\"")))) ; else - ( sendToServer(QString("SETCONF %1=\"%2\"").arg((*it).name()).arg( (*it).property().toStringList().join(",")))); + ( sendToServer(TQString("SETCONF %1=\"%2\"").arg((*it).name()).arg( (*it).property().toStringList().join(",")))); return false; } if ((*it).name() == "HiddenServices"){ - QStringList hiddenServices = TorkConfig::hiddenServices(); - QString allservices; - for ( QStringList::Iterator it = (hiddenServices).begin(); it != (hiddenServices).end(); it++ ) + TQStringList hiddenServices = TorkConfig::hiddenServices(); + TQString allservices; + for ( TQStringList::Iterator it = (hiddenServices).begin(); it != (hiddenServices).end(); it++ ) { if ((*it).isEmpty()) continue; - allservices += (QString("HiddenServiceDir=\"%1\" HiddenServicePort=\"%2 %3\" ").arg((*it).section("\n",-1)).arg((*it).section("\n",-4,-4)).arg((*it).section("\n",-3,-3))) ; + allservices += (TQString("HiddenServiceDir=\"%1\" HiddenServicePort=\"%2 %3\" ").arg((*it).section("\n",-1)).arg((*it).section("\n",-4,-4)).arg((*it).section("\n",-3,-3))) ; } if (!allservices.isEmpty()) - ( sendToServer(QString("SETCONF %1").arg(allservices))) ; + ( sendToServer(TQString("SETCONF %1").arg(allservices))) ; else - ( sendToServer(QString("SETCONF HiddenServiceDir= HiddenServicePort="))) ; + ( sendToServer(TQString("SETCONF HiddenServiceDir= HiddenServicePort="))) ; return false; } if ((TorkConfig::useBridges()) && ((*it).name() == "Bridge")){ - QStringList bridges = TorkConfig::bridge(); - QString allbridges; - for ( QStringList::Iterator it = (bridges).begin(); it != (bridges).end(); it++ ) + TQStringList bridges = TorkConfig::bridge(); + TQString allbridges; + for ( TQStringList::Iterator it = (bridges).begin(); it != (bridges).end(); it++ ) { if ((*it).isEmpty()) continue; - allbridges += (QString("Bridge=\"%1\" ") + allbridges += (TQString("Bridge=\"%1\" ") .arg((*it))) ; } if (!allbridges.isEmpty()) - ( sendToServer(QString("SETCONF %1").arg(allbridges))) ; + ( sendToServer(TQString("SETCONF %1").arg(allbridges))) ; else - ( sendToServer(QString("SETCONF Bridge="))) ; + ( sendToServer(TQString("SETCONF Bridge="))) ; return false; } if ((*it).name() == "MyFamily"){ - QStringList family = TorkConfig::myFamily(); - QStringList allfamily; - for ( QStringList::Iterator it = (family).begin(); it != (family).end(); it++ ) + TQStringList family = TorkConfig::myFamily(); + TQStringList allfamily; + for ( TQStringList::Iterator it = (family).begin(); it != (family).end(); it++ ) { if ((*it).isEmpty()) continue; - QString node = "$"+getFPFromFPDigest((*it).section("-",1,1)); + TQString node = "$"+getFPFromFPDigest((*it).section("-",1,1)); allfamily.append(node) ; } if (!allfamily.isEmpty()) - ( sendToServer(QString("SETCONF MyFamily=%1").arg(allfamily.join(",")))) ; + ( sendToServer(TQString("SETCONF MyFamily=%1").arg(allfamily.join(",")))) ; else - ( sendToServer(QString("SETCONF MyFamily="))) ; + ( sendToServer(TQString("SETCONF MyFamily="))) ; return false; } if ((*it).name() == "MapAddress"){ - QStringList maps = TorkConfig::mapAddress(); - for ( QStringList::Iterator it = (maps).begin(); + TQStringList maps = TorkConfig::mapAddress(); + for ( TQStringList::Iterator it = (maps).begin(); it != (maps).end(); it++ ) { if ((*it).isEmpty()) continue; - ( sendToServer(QString("SETCONF MapAddress=%2").arg((*it)))) ; + ( sendToServer(TQString("SETCONF MapAddress=%2").arg((*it)))) ; } return false; } if ((!TorkConfig::fascistFirewall()) && ((*it).name() == "ReachableAddresses")){ - ( sendToServer(QString("SETCONF ReachableAddresses="))) ; + ( sendToServer(TQString("SETCONF ReachableAddresses="))) ; return false; } return true; @@ -1416,7 +1416,7 @@ void TorClient::cleanUp() if (TorkConfig::hashedControlPassword().isEmpty() && (!TorkConfig::cookieAuthentication()) && TorkConfig::generateRandomPassword()){ - sendToServer(QString("setconf HashedControlPassword=")); + sendToServer(TQString("setconf HashedControlPassword=")); socket->flush(); } } @@ -1426,7 +1426,7 @@ TorClient::~TorClient() } -void TorClient::parseDirStatus(const QString &info) +void TorClient::parseDirStatus(const TQString &info) { @@ -1440,7 +1440,7 @@ void TorClient::parseDirStatus(const QString &info) if (info.left(2) == "s "){ - if (QDate::currentDate().daysTo(QDate(ds_date.left(4).toInt(), + if (TQDate::currentDate().daysTo(TQDate(ds_date.left(4).toInt(), ds_date.mid(5,2).toInt(),ds_date.right(2).toInt())) > -30) { if (server(ds_identity).isEmpty()) storeServer(ds_server,ds_identity); @@ -1458,23 +1458,23 @@ bool TorClient::isControllerWorking() } -void TorClient::setBandwidth(const QString &rate, const QString &burst, const QString &max) +void TorClient::setBandwidth(const TQString &rate, const TQString &burst, const TQString &max) { - ( sendToServer(QString("SETCONF BandwidthRate=%2KB BandwidthBurst=%2KB") + ( sendToServer(TQString("SETCONF BandwidthRate=%2KB BandwidthBurst=%2KB") .arg(rate).arg(burst))); if (!max.isEmpty()) - ( sendToServer(QString("SETCONF MaxAdvertisedBandwidth=%2KB").arg(max))); + ( sendToServer(TQString("SETCONF MaxAdvertisedBandwidth=%2KB").arg(max))); getBandwidth(); } void TorClient::getBandwidth() { - ( sendToServer(QString("GETCONF BandwidthRate"))); - ( sendToServer(QString("GETCONF BandwidthBurst"))); - ( sendToServer(QString("GETCONF MaxAdvertisedBandwidth"))); + ( sendToServer(TQString("GETCONF BandwidthRate"))); + ( sendToServer(TQString("GETCONF BandwidthBurst"))); + ( sendToServer(TQString("GETCONF MaxAdvertisedBandwidth"))); } -void TorClient::handleTorVersion( const QString &caption) +void TorClient::handleTorVersion( const TQString &caption) { m_currentTorVersion = caption; if (m_currentTorVersion.left(3) == "0.2") @@ -1482,9 +1482,9 @@ void TorClient::handleTorVersion( const QString &caption) emit setTorCaption(caption); } -void TorClient::closeAllCircuits( QListView* &circuitList) +void TorClient::closeAllCircuits( TQListView* &circuitList) { - QListViewItemIterator cit(circuitList); + TQListViewItemIterator cit(circuitList); while ( cit.current() ) { attemptCloseCircuit(cit.current()->text(0)); ++cit; @@ -1511,23 +1511,23 @@ void TorClient::allowPlainTextPorts() kdDebug() << "m_portsToReject " << m_portsToReject << endl; m_portsToReject.remove(m_portsToReject.find(m_portToRemove)); - sendToServer(QString("SETCONF WarnPlainTextPorts=%1") + sendToServer(TQString("SETCONF WarnPlainTextPorts=%1") .arg(m_portsToReject.join(","))); - sendToServer(QString("SETCONF RejectPlainTextPorts=%1") + sendToServer(TQString("SETCONF RejectPlainTextPorts=%1") .arg(m_portsToReject.join(","))); } -void TorClient::resolveAddress(const QString &address) +void TorClient::resolveAddress(const TQString &address) { - QRegExp rx("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"); + TQRegExp rx("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"); rx.search(address); - QString tmp = rx.cap(0); + TQString tmp = rx.cap(0); if (tmp.isEmpty()) { sendToServer("RESOLVE " + address); logResolveList << address; }else{ sendToServer("RESOLVE mode=reverse " + tmp); - logResolveList << QString("REVERSE[%1]").arg(tmp); + logResolveList << TQString("REVERSE[%1]").arg(tmp); } } diff --git a/src/torclient.h b/src/torclient.h index caaed20..bb64476 100644 --- a/src/torclient.h +++ b/src/torclient.h @@ -21,7 +21,7 @@ ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file is part of an example program for Qt. This example +** This file is part of an example program for TQt. This example ** program may be used, distributed and modified without limitation. ** *****************************************************************************/ @@ -29,11 +29,11 @@ #ifndef _TORCLIENT_H_ #define _TORCLIENT_H_ -#include <qsocket.h> -#include <qtextstream.h> +#include <ntqsocket.h> +#include <ntqtextstream.h> #include <kdebug.h> #include <kconfigskeleton.h> -#include <qlistview.h> +#include <ntqlistview.h> #include "torkconfig.h" @@ -44,44 +44,44 @@ class PrevConfig { public: PrevConfig(): pr(0) {} - PrevConfig( const QString& name, const QVariant& property ) + PrevConfig( const TQString& name, const TQVariant& property ) : nm(name), pr(property) {} - typedef QValueList<PrevConfig> PrevConfigList; - QString name() const { return nm; } - QVariant property() const { return pr; } - void setName( QString n ) { nm = n; } - void setProperty( QVariant p ) { pr = p; } + typedef TQValueList<PrevConfig> PrevConfigList; + TQString name() const { return nm; } + TQVariant property() const { return pr; } + void setName( TQString n ) { nm = n; } + void setProperty( TQVariant p ) { pr = p; } private: - QString nm; - QVariant pr; + TQString nm; + TQVariant pr; }; -class TorClient : public QObject +class TorClient : public TQObject { Q_OBJECT public: - TorClient( const QString &host, Q_UINT16 port ); + TorClient( const TQString &host, TQ_UINT16 port ); virtual ~TorClient(); - void sendToServer(const QString &string) + void sendToServer(const TQString &string) { if (!socket) return; - QTextStream os(socket); + TQTextStream os(socket); os << string << "\r\n"; } - QStringList currentServerReport() + TQStringList currentServerReport() { return serverReport; } - QStringList currentClientReport() + TQStringList currentClientReport() { return clientReport; } @@ -90,8 +90,8 @@ public: bool isControllerWorking( ); void updatePrevConfig(PrevConfig::PrevConfigList previtems); void newIdentity(); - void createService(const QString &dir, const QString &port); - void setBandwidth(const QString &rate, const QString &burst, const QString &max); + void createService(const TQString &dir, const TQString &port); + void setBandwidth(const TQString &rate, const TQString &burst, const TQString &max); void setGeoIPAvailable(bool set){geoip_db = set;}; unsigned long int getCurBandwidthRate(){return m_CurBandwidthRate;}; unsigned long int getCurBandwidthBurst(){return m_CurBandwidthBurst;}; @@ -104,22 +104,22 @@ public: signals: - void streamStatusUpdate(const QString &, const QString &, - const QString &, const QString &, const QString &); - void ORStatusUpdate(const QString &, const QString &); - void guardStatusUpdate(const QString &, const QString &); - void circuitStatusUpdate(const QString &, const QString &, - const QString &, const QString &); - void infoUpdate(const QString &,const QString &, const QString &); - void bwUpdate(const QString &,const QString &); - void updateActiveServers(const QStringList &); - void updateServerStatus(const QString &, const QString &, - const QString &,const QString &); + void streamStatusUpdate(const TQString &, const TQString &, + const TQString &, const TQString &, const TQString &); + void ORStatusUpdate(const TQString &, const TQString &); + void guardStatusUpdate(const TQString &, const TQString &); + void circuitStatusUpdate(const TQString &, const TQString &, + const TQString &, const TQString &); + void infoUpdate(const TQString &,const TQString &, const TQString &); + void bwUpdate(const TQString &,const TQString &); + void updateActiveServers(const TQStringList &); + void updateServerStatus(const TQString &, const TQString &, + const TQString &,const TQString &); void fatalError(); void serverError(); - void displayError(const QString &,const QString &); - void displayServer(const QString &,const QString &); - void whatImDoing(const QString &); + void displayError(const TQString &,const TQString &); + void displayServer(const TQString &,const TQString &); + void whatImDoing(const TQString &); void copyOldConfig(); void shouldIApplySettings(); void torConnectionClosed(); @@ -128,26 +128,26 @@ signals: void needAlphaVersion( ); void connectedToTor( ); void authenticated(); - void streamBwUpdate(const QString &,const QString &,const QString & ); - void setTorCaption(const QString &); - void processWarning(const QString &,const QString &); - void processQuestion(const QString &,const QString &); - void showServerBW(const QString&); - void updateTrayIcon(const QString&); - void resolvedAddress(const QString&); + void streamBwUpdate(const TQString &,const TQString &,const TQString & ); + void setTorCaption(const TQString &); + void processWarning(const TQString &,const TQString &); + void processQuestion(const TQString &,const TQString &); + void showServerBW(const TQString&); + void updateTrayIcon(const TQString&); + void resolvedAddress(const TQString&); void authenticationFailed(); public slots: void socketReadyRead(); void applySettingsToRunningTor(); - void attemptAttach(const QString &, const QString &); - void attemptExtendCircuit(const QString &, const QString &, bool); - void attemptCreateCircuit(const QString &, bool); - void attemptCloseStream(const QString &); + void attemptAttach(const TQString &, const TQString &); + void attemptExtendCircuit(const TQString &, const TQString &, bool); + void attemptCreateCircuit(const TQString &, bool); + void attemptCloseStream(const TQString &); void attemptAttachStreams( bool ); - void attemptCloseCircuit(const QString &); - void fetchServerInfo(const QString &); - void fetchServerInfoByNick(const QString &); + void attemptCloseCircuit(const TQString &); + void fetchServerInfo(const TQString &); + void fetchServerInfoByNick(const TQString &); void slotCheckTorNet(); void authenticate(); void slotCheckGuards(); @@ -158,17 +158,17 @@ public slots: void clearNodes(); void strictExitNodes( bool strict ); void configureServer( int orPort, int dirPort); - void closeAllCircuits( QListView* &circuitList); + void closeAllCircuits( TQListView* &circuitList); void allowPlainTextPorts( ); void assignPortToRemove(); - void resolveAddress(const QString &); + void resolveAddress(const TQString &); void terminateTor(); private slots: void closeConnection() { socket->close(); - if ( socket->state() == QSocket::Closing ) { + if ( socket->state() == TQSocket::Closing ) { // We have a delayed close. connect( socket, SIGNAL(delayedCloseFinished()), SLOT(socketClosed()) ); @@ -195,36 +195,36 @@ private slots: void socketError( int e ) { - if ( e == QSocket::ErrHostNotFound || - e == QSocket::ErrConnectionRefused ) + if ( e == TQSocket::ErrHostNotFound || + e == TQSocket::ErrConnectionRefused ) emit fatalError(); } - void parseEvent(const QString &type, const QString &info); - void parseStream(const QString &info); - void parseGuards(const QString &info); - void parseORConn(const QString &info); - void parseServer(const QString &info); - void parseCircuit(const QString &info); - void parseInfo(const QString &type, const QString &info); - void parseBW(const QString &info); - void parseAddrmap(const QString &info); - void parseStreamBW(const QString &info); - void parseDirStatus(const QString &info); - void parseStatusGeneral(const QString &info); + void parseEvent(const TQString &type, const TQString &info); + void parseStream(const TQString &info); + void parseGuards(const TQString &info); + void parseORConn(const TQString &info); + void parseServer(const TQString &info); + void parseCircuit(const TQString &info); + void parseInfo(const TQString &type, const TQString &info); + void parseBW(const TQString &info); + void parseAddrmap(const TQString &info); + void parseStreamBW(const TQString &info); + void parseDirStatus(const TQString &info); + void parseStatusGeneral(const TQString &info); void resetClientReport(); - void updateCandidateServers(const QString &path); - void handle250(const QString &line); - void updateServerReport(const QString &message, - const QString &info); - void updateClientReport(const QString &message); - void populateMessageFromStatusDetail(const QString &line, - QString &message); - void handleTorVersion( const QString &caption); + void updateCandidateServers(const TQString &path); + void handle250(const TQString &line); + void updateServerReport(const TQString &message, + const TQString &info); + void updateClientReport(const TQString &message); + void populateMessageFromStatusDetail(const TQString &line, + TQString &message); + void handleTorVersion( const TQString &caption); void readRouters(); private: - QSocket *socket; + TQSocket *socket; bool m_expectingCircuitInfo; bool m_expectingStreamInfo; bool m_expectingOrconnInfo; @@ -233,18 +233,18 @@ private: bool m_expectingServerInfo; bool m_resolvingServerAddress; bool geoip_db; - QString m_currentTorVersion; + TQString m_currentTorVersion; bool elementShouldBeUsed(const KConfigSkeletonItem* it); bool noSpecialProcessing(const KConfigSkeletonItem* it); bool readCookie(); - QString ds_identity; - QString ds_fp_identity; - QString ds_ip; - QString ds_server; - QString ds_date; - QString ds_statuses; - QString m_statustip; - QString m_statustiptmp; + TQString ds_identity; + TQString ds_fp_identity; + TQString ds_ip; + TQString ds_server; + TQString ds_date; + TQString ds_statuses; + TQString m_statustip; + TQString m_statustiptmp; bool m_controllerWorking; bool authorityread; bool m_firstloadcomplete; @@ -253,20 +253,20 @@ private: int m_CurBandwidthRate; int m_CurBandwidthBurst; int m_CurMaxAdvertisedBandwidth; - QString m_statustipIP; - typedef QMap<QString, QString> statusmap; + TQString m_statustipIP; + typedef TQMap<TQString, TQString> statusmap; statusmap statusMessage; statusmap serverStatus; statusmap serverStatusIcon; statusmap clientStatus; statusmap portMessage; statusmap clientStatusIcon; - QStringList serverReport; - QStringList clientReport; - QStringList m_WarnedPorts; - QStringList m_portsToReject; - QString m_portToRemove; - QStringList logResolveList; + TQStringList serverReport; + TQStringList clientReport; + TQStringList m_WarnedPorts; + TQStringList m_portsToReject; + TQString m_portToRemove; + TQStringList logResolveList; }; #endif // diff --git a/src/tork.cpp b/src/tork.cpp index 22e5b61..00a5a47 100644 --- a/src/tork.cpp +++ b/src/tork.cpp @@ -20,12 +20,12 @@ ***************************************************************************/ -#include <qdragobject.h> +#include <ntqdragobject.h> #include <kprinter.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qtimer.h> -#include <qgroupbox.h> +#include <ntqpainter.h> +#include <ntqpaintdevicemetrics.h> +#include <ntqtimer.h> +#include <ntqgroupbox.h> #include <kconfigdialog.h> #include <kglobal.h> @@ -61,12 +61,12 @@ #include <knotifyclient.h> #include <klistviewsearchline.h> -#include <qtooltip.h> -#include <qlabel.h> -#include <qfile.h> -#include <qdir.h> -#include <qtabwidget.h> -#include <qhostaddress.h> +#include <ntqtooltip.h> +#include <ntqlabel.h> +#include <ntqfile.h> +#include <ntqdir.h> +#include <ntqtabwidget.h> +#include <ntqhostaddress.h> #include <dcopref.h> #include <dcopclient.h> #include <kcmdlineargs.h> @@ -106,13 +106,13 @@ const char *dayweekmonth[] = { "month" }; -QValueVector<QString> serverCondition(9); -QValueVector<QString> logType(5); -QValueVector<QString> torkifyApp(5); -QValueVector<QString> torTrafficType(9); -QValueVector<QString> nonTorTrafficType(9); -QValueVector<QString> subnetType(256); -QValueVector<QString> countryType(256); +TQValueVector<TQString> serverCondition(9); +TQValueVector<TQString> logType(5); +TQValueVector<TQString> torkifyApp(5); +TQValueVector<TQString> torTrafficType(9); +TQValueVector<TQString> nonTorTrafficType(9); +TQValueVector<TQString> subnetType(256); +TQValueVector<TQString> countryType(256); tork::tork() @@ -210,7 +210,7 @@ tork::tork() // Instanciate the LikeBack system, and show the first-use information dialog if the button-bar is shown: LikeBack *likeBack = new LikeBack(LikeBack::AllButtons, LikeBack::isDevelopmentVersion(TORK_VERSION)); // Show button-bar only in beta-versions likeBack->setServer("tork.sourceforge.net", "/likeback/send.php"); - likeBack->setAcceptedLanguages(QStringList::split(";", "en;fr"), i18n("Please write in English or French.")); + likeBack->setAcceptedLanguages(TQStringList::split(";", "en;fr"), i18n("Please write in English or French.")); // Comment the following line once you are sure all your windows have a name: likeBack->setWindowNamesListing(LikeBack::WarnUnnamedWindows); @@ -222,8 +222,8 @@ tork::tork() // and a status bar statusBar()->show(); - m_statusInfo = new QLabel(this); - m_statusTransfer = new QLabel(this); + m_statusInfo = new TQLabel(this); + m_statusTransfer = new TQLabel(this); statusBar()->addWidget(m_statusInfo,2); statusBar()->addWidget(m_statusTransfer,2); @@ -246,10 +246,10 @@ tork::tork() setUpnpORPort(TorkConfig::oRListenAddress()); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL(updateTrayStats(const QString&, const QString&, - const QString&, const QString&)), - this, SLOT(updateTrayStats(const QString&,const QString&, - const QString&, const QString&))); + connect(m_view, SIGNAL(updateTrayStats(const TQString&, const TQString&, + const TQString&, const TQString&)), + this, SLOT(updateTrayStats(const TQString&,const TQString&, + const TQString&, const TQString&))); connect(m_view->m_osd, SIGNAL(requestHideMonitor()), this, SLOT(toggleTorMon2())); connect(m_view->m_osd, SIGNAL(requestToggleKDE()), @@ -257,10 +257,10 @@ tork::tork() connect(m_view->m_osd, SIGNAL(requestChangeID()), this, SLOT(useNewIdentity())); - connect(m_view, SIGNAL(showSecurityNotice(const QString&)), - this, SLOT(showSecurityNotice(const QString&))); - connect(m_view, SIGNAL(showScreamingNotice(const QString&)), - this, SLOT(showScreamingNotice(const QString&))); + connect(m_view, SIGNAL(showSecurityNotice(const TQString&)), + this, SLOT(showSecurityNotice(const TQString&))); + connect(m_view, SIGNAL(showScreamingNotice(const TQString&)), + this, SLOT(showScreamingNotice(const TQString&))); connect(m_view, SIGNAL(newIdentity()), this, SLOT(useNewIdentity())); @@ -297,22 +297,22 @@ tork::tork() connect(m_view, SIGNAL(toggleNonTorTraffic(bool)), this, SLOT(toggleNonTorTraffic(bool))); - connect(m_view, SIGNAL(processWarning(const QString& , const QString& )), - this, SLOT(processWarning(const QString& , const QString& ))); + connect(m_view, SIGNAL(processWarning(const TQString& , const TQString& )), + this, SLOT(processWarning(const TQString& , const TQString& ))); connect(m_view, SIGNAL(copyOldConfig()), this, SLOT(copyOldConfig())); connect(UPnPManager::Manager(),SIGNAL(routerDiscovered( kt::UPnPRouter* )), this,SLOT(routerDiscovered( kt::UPnPRouter* ))); - connect(UPnPManager::Manager(),SIGNAL(forwardingOK(kt::UPnPRouter*, const QString &, bool )), - this,SLOT(upnpForwardingOK(kt::UPnPRouter*, const QString & , bool))); - connect(UPnPManager::Manager(),SIGNAL(forwardingError(kt::UPnPRouter*, const QString &, bool )), - this,SLOT(upnpForwardingError(kt::UPnPRouter*, const QString &, bool ))); + connect(UPnPManager::Manager(),SIGNAL(forwardingOK(kt::UPnPRouter*, const TQString &, bool )), + this,SLOT(upnpForwardingOK(kt::UPnPRouter*, const TQString & , bool))); + connect(UPnPManager::Manager(),SIGNAL(forwardingError(kt::UPnPRouter*, const TQString &, bool )), + this,SLOT(upnpForwardingError(kt::UPnPRouter*, const TQString &, bool ))); /* if (!TorkConfig::clientOnly() && TorkConfig::forwardPorts()){ upnpmanager->discover();*/ - QTimer::singleShot( 20000, this, SLOT(checkRouterDiscovered()) ); + TQTimer::singleShot( 20000, this, SLOT(checkRouterDiscovered()) ); /* }*/ @@ -421,10 +421,10 @@ void tork::prepareToShut() //delete config; // Inform all running io-slaves about the changes... // if we cannot update, ioslaves inform the end user... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", QString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) { - QString caption = i18n("Update Failed"); - QString message = i18n("You have to restart the running applications " + TQString caption = i18n("Update Failed"); + TQString message = i18n("You have to restart the running applications " "for these changes to take effect."); KMessageBox::information (this, message, caption); return; @@ -533,7 +533,7 @@ void tork::setupActions() toggleTorbar = new KAction(i18n("Toggle Tor Bar"), "tork_tor", 0,this, SLOT(toggleTorBar()),actionCollection(),"toggle_torbar"); - connect(m_view->TorkTabs,SIGNAL(currentChanged( QWidget* )),SLOT(currentTabChanged( QWidget* ))); + connect(m_view->TorkTabs,SIGNAL(currentChanged( TQWidget* )),SLOT(currentTabChanged( TQWidget* ))); //Servers Filter @@ -845,8 +845,8 @@ void tork::setupActions() _tray->updateStats(BytesPerSecToString(0),BytesPerSecToString(0), BytesPerSecToString(0),BytesPerSecToString(0), - QStringList("<font color='#990000'>Status Not Known</font>"), - QStringList("<font color='#990000'>Status Not Known</font>"), + TQStringList("<font color='#990000'>Status Not Known</font>"), + TQStringList("<font color='#990000'>Status Not Known</font>"), BytesPerSecToString(0)); _tray->show(); @@ -861,9 +861,9 @@ void tork::populateCountryMenu() { //GeoIP_country_name - QValueList<int> tmplist = m_view->countryList(); + TQValueList<int> tmplist = m_view->countryList(); qHeapSort( tmplist ); - for ( QValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) + for ( TQValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { if (!continentMapList.contains(GeoIP_country_continent[(*it)])) { kdDebug() << "unknown continent" << GeoIP_country_continent[(*it)] << endl; @@ -874,8 +874,8 @@ void tork::populateCountryMenu() continue; } continentMapList[GeoIP_country_continent[(*it)]]->insertItem( - QString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") : - SmallIcon(QString("tork_%1").arg(GeoIP_country_code[(*it)]).lower()), + TQString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") : + SmallIcon(TQString("tork_%1").arg(GeoIP_country_code[(*it)]).lower()), GeoIP_country_name[(*it)], this, SLOT( filterCountries( int ) ), 0, (*it) ); } @@ -886,9 +886,9 @@ void tork::populatePseudoMenu() { //GeoIP_country_name - QValueList<int> tmplist = m_view->countryList(); + TQValueList<int> tmplist = m_view->countryList(); qHeapSort( tmplist ); - for ( QValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) + for ( TQValueList<int>::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { if (!continentMap.contains(GeoIP_country_continent[(*it)])) { kdDebug() << "unknown continent" << GeoIP_country_continent[(*it)] << endl; @@ -898,8 +898,8 @@ void tork::populatePseudoMenu() if ( continentMap[GeoIP_country_continent[(*it)]]->findItem( (*it) ) ) continue; continentMap[GeoIP_country_continent[(*it)]]->insertItem( - QString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") : - SmallIcon(QString("tork_%1").arg(GeoIP_country_code[(*it)]).lower()), + TQString(GeoIP_country_code[(*it)]).contains("--") ? SmallIcon("help") : + SmallIcon(TQString("tork_%1").arg(GeoIP_country_code[(*it)]).lower()), GeoIP_country_name[(*it)], this, SLOT( applyPseudonymity( int ) ), 0, (*it) ); } @@ -914,7 +914,7 @@ void tork::applyPseudonymity( int country_id ) } // Update Menu - for ( QMap<QString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu ) + for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu ) { for (unsigned int index = 0; index != menu.data()->count(); ++index){ menu.data()->setItemChecked( menu.data()->idAt(index),false); @@ -937,13 +937,13 @@ void tork::applyPseudonymity( int country_id ) continentMap[GeoIP_country_continent[country_id]]->setItemChecked( country_id, !continentMap[GeoIP_country_continent[country_id]]->isItemChecked(country_id) ); //uncheck old item - QStringList currentList; - QString cc = QString("%1").arg(country_id); + TQStringList currentList; + TQString cc = TQString("%1").arg(country_id); - QListViewItemIterator it(m_view->serverList); + TQListViewItemIterator it(m_view->serverList); while ( it.current() ) { if ((*it)->text(4) == cc){ - QString node = "$"+getFPFromFPDigest((*it)->text(2)); + TQString node = "$"+getFPFromFPDigest((*it)->text(2)); currentList.append(node); } ++it; @@ -954,7 +954,7 @@ void tork::applyPseudonymity( int country_id ) // Update Tor with new exit list and flush all existing circuits if (client != 0L){ //Close all open circuits first - QListView* tmp = dynamic_cast<QListView*>(m_view->circuitList); + TQListView* tmp = dynamic_cast<TQListView*>(m_view->circuitList); client->closeAllCircuits(tmp); //Then apply new exit list client->updateExitNodes(); @@ -974,13 +974,13 @@ void tork::populateSubNetMenu() m_IPFilterMenu->insertItem( "All", this, SLOT( filterSubnets( int ) ), 0, 0); } - QStringList tmplist = m_view->subnet16List(); + TQStringList tmplist = m_view->subnet16List(); tmplist.sort(); - for ( QStringList::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) + for ( TQStringList::Iterator it = tmplist.begin(); it != tmplist.end(); ++it ) { if ((*it).isEmpty()) continue; - QString tmpit = (*it); + TQString tmpit = (*it); int index = tmpit.replace(".","").toInt(); if ( m_IPFilterMenu->findItem( index ) ) @@ -999,7 +999,7 @@ void tork::torkify(int id) } void -tork::currentTabChanged(QWidget* cur ) //SLOT +tork::currentTabChanged(TQWidget* cur ) //SLOT { toolBar()->setIconText( KToolBar::IconTextRight, false ); @@ -1065,13 +1065,13 @@ tork::sortByCountry( ) //SLOT void tork::filterSubnets( int ) //SLOT { - //filterView(subnetType, (QListView*&)m_view->serverList, m_IPFilterMenu, id, 5); + //filterView(subnetType, (TQListView*&)m_view->serverList, m_IPFilterMenu, id, 5); } void tork::filterNonTorTraffic( int id ) //SLOT { - QListViewItemIterator it(m_view->NonTorTraffic); + TQListViewItemIterator it(m_view->NonTorTraffic); while ( it.current() ) { it.current()->setVisible(false); ++it; @@ -1085,7 +1085,7 @@ tork::filterNonTorTraffic( int id ) //SLOT void tork::filterTorTraffic( int id ) //SLOT { - QListViewItemIterator it(m_view->TorTraffic); + TQListViewItemIterator it(m_view->TorTraffic); while ( it.current() ) { it.current()->setVisible(false); ++it; @@ -1237,9 +1237,9 @@ tork::configureSecurity( int id ) //SLOT if (m_SecurityButtonMenu->isItemChecked( id)) return; - QString cmd; - QString iconstring; - QString filterRequest; + TQString cmd; + TQString iconstring; + TQString filterRequest; filterId = id; @@ -1277,7 +1277,7 @@ tork::configureSecurity( int id ) //SLOT filterproc = new KProcIO(); filterproc->setUseShell(TRUE); - QString filterCommand= QString("kdesu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c " + TQString filterCommand= TQString("kdesu --noignorebutton --miniicon tork --caption '%1' -t -i %2 -d -c " "'%3'").arg(filterRequest).arg(iconstring).arg(cmd); connect( filterproc, SIGNAL(readReady(KProcIO * )), SLOT(processFilter(KProcIO * )) ); @@ -1291,7 +1291,7 @@ tork::configureSecurity( int id ) //SLOT void tork::processFilter(KProcIO *filterproc) { - QString item = ""; + TQString item = ""; int pos; while ((pos = (filterproc->readln(item,true))) != -1) { @@ -1367,26 +1367,26 @@ void tork::filterExited() filterproc = 0L; } -QString tork::createFailSafeCommand( const QStringList &filterRules, bool set ) //SLOT +TQString tork::createFailSafeCommand( const TQStringList &filterRules, bool set ) //SLOT { - QString cmd; - QStringList rules = filterRules; - for ( QStringList::Iterator it = rules.begin(); it != rules.end(); ++it ) + TQString cmd; + TQStringList rules = filterRules; + for ( TQStringList::Iterator it = rules.begin(); it != rules.end(); ++it ) { if ((*it).isEmpty()) continue; - QString active = (*it).section("%:%",0,0); + TQString active = (*it).section("%:%",0,0); if (active.contains("button_cancel") && (set)) continue; - QString entry = (*it).section("%:%",2,2); + TQString entry = (*it).section("%:%",2,2); if (set){ - cmd.append(QString("%1;").arg(entry)); + cmd.append(TQString("%1;").arg(entry)); }else{ - cmd.append(QString("%1;").arg(entry.replace(" -I "," -D "))); + cmd.append(TQString("%1;").arg(entry.replace(" -I "," -D "))); } } @@ -1397,7 +1397,7 @@ QString tork::createFailSafeCommand( const QStringList &filterRules, bool set ) void tork::filterLog( int id ) //SLOT { - QListViewItemIterator it(m_view->infoList); + TQListViewItemIterator it(m_view->infoList); while ( it.current() ) { it.current()->setVisible(false); ++it; @@ -1422,7 +1422,7 @@ tork::filterCountries( int id ) //SLOT // If 'All'is selected, display all entries; otherwise hide all entries - QListViewItemIterator it(m_view->serverList); + TQListViewItemIterator it(m_view->serverList); while ( it.current() ) { it.current()->setVisible(m_CountryMenu->isItemChecked(251)); ++it; @@ -1435,7 +1435,7 @@ tork::filterCountries( int id ) //SLOT // Display servers for each selected country - for ( QMap<QString, KPopupMenu*>::Iterator menu = continentMapList.begin(); + for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMapList.begin(); menu != continentMapList.end(); ++menu ){ if (m_CountryMenu->isItemChecked(251)){ // If 'All' selected, deselect all items for (unsigned int index = 0; index != menu.data()->count(); ++index){ @@ -1444,7 +1444,7 @@ tork::filterCountries( int id ) //SLOT continue; } menu.data()->setItemChecked( id, !menu.data()->isItemChecked(id) ); // Toggle selected item - QListView* tmp = dynamic_cast<QListView*>(m_view->serverList); + TQListView* tmp = dynamic_cast<TQListView*>(m_view->serverList); filterView(countryType, tmp, menu.data(), id, 4); } @@ -1455,7 +1455,7 @@ tork::filterCountries( int id ) //SLOT } // Of servers displayed above, display only the ones with all selected criteria. - QListView* tmp = dynamic_cast<QListView*>(m_view->serverList); + TQListView* tmp = dynamic_cast<TQListView*>(m_view->serverList); filterViewServers(serverCondition, tmp, m_ServerFilterMenu, 99, 3); } @@ -1464,7 +1464,7 @@ void tork::toggleIP( int id ) //SLOT { - QListViewItemIterator it(m_view->serverList); + TQListViewItemIterator it(m_view->serverList); if (m_ServerFilterMenu->text( id ).contains("IP")) { while ( it.current() ) { it.current()->setText(1,it.current()->text(5)); @@ -1511,7 +1511,7 @@ tork::filterServers( int id ) //SLOT //We always need to get all servers for selected countries again if (m_CountryMenu->isItemChecked( 251 )){ // If 'All' countries are selected - QListViewItemIterator it(m_view->serverList); + TQListViewItemIterator it(m_view->serverList); while ( it.current() ) { it.current()->setVisible(true); ++it; @@ -1519,16 +1519,16 @@ tork::filterServers( int id ) //SLOT }else{ - QListViewItemIterator it(m_view->serverList); + TQListViewItemIterator it(m_view->serverList); while ( it.current() ) { it.current()->setVisible(false); ++it; } - for ( QMap<QString, + for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMapList.begin(); menu != continentMapList.end(); ++menu ){ - QListView* tmp = dynamic_cast<QListView*>(m_view->serverList); + TQListView* tmp = dynamic_cast<TQListView*>(m_view->serverList); filterView(countryType, tmp, menu.data(), 255, 4); } } @@ -1550,18 +1550,18 @@ tork::filterServers( int id ) //SLOT // Of servers displayed above, display only the ones with all selected //criteria. - QListView* tmp = dynamic_cast<QListView*>(m_view->serverList); + TQListView* tmp = dynamic_cast<TQListView*>(m_view->serverList); filterViewServers(serverCondition, tmp, m_ServerFilterMenu, id, 3); } void -tork::filterView( QValueVector<QString> &possibleValues, QListView* &view, +tork::filterView( TQValueVector<TQString> &possibleValues, TQListView* &view, KPopupMenu* &menu, int id, int column ){ if (possibleValues[id] == "All"){ - QListViewItemIterator it(view); + TQListViewItemIterator it(view); while ( it.current() ) { it.current()->setVisible(true); ++it; @@ -1580,10 +1580,10 @@ tork::filterView( QValueVector<QString> &possibleValues, QListView* &view, else menu->setItemChecked( 0, false ); //Uncheck 'All' Item - QString check; + TQString check; for (unsigned int index = 0; index != possibleValues.count(); ++index){ if (menu->isItemChecked( menu->idAt(index) )){ - QListViewItemIterator it(view); + TQListViewItemIterator it(view); while ( it.current() ) { if (possibleValues == countryType) check = GeoIP_country_code[it.current()->text(column).toInt()]; @@ -1600,15 +1600,15 @@ tork::filterView( QValueVector<QString> &possibleValues, QListView* &view, } void -tork::filterViewServers( QValueVector<QString> &possibleValues, - QListView* &view, KPopupMenu* &menu, int , +tork::filterViewServers( TQValueVector<TQString> &possibleValues, + TQListView* &view, KPopupMenu* &menu, int , int column) //SLOT { for (unsigned int index = 0; index != possibleValues.count(); ++index){ if (menu->isItemChecked( menu->idAt(index) )){ - QListViewItemIterator it(view,QListViewItemIterator::Visible); + TQListViewItemIterator it(view,TQListViewItemIterator::Visible); while ( it.current() ) { if (!it.current()->text(column) @@ -1628,22 +1628,22 @@ void tork::createSubnetList( ) //SLOT { - QListViewItem *nextOne; - QListViewItem *tm; + TQListViewItem *nextOne; + TQListViewItem *tm; - for (QListViewItem *child = m_view->serverList->firstChild(); child; + for (TQListViewItem *child = m_view->serverList->firstChild(); child; child = nextOne) { nextOne = child->nextSibling(); - QRegExp rx("^[0-9]{1,3}\\.[0-9]{1,3}\\."); + TQRegExp rx("^[0-9]{1,3}\\.[0-9]{1,3}\\."); rx.search(child->text(5)); - QString tmp = rx.cap(0); + TQString tmp = rx.cap(0); if (tmp.isEmpty()){ break; } if (!( tm = m_view->serverList->findItem((tmp),0))){ - tm = new QListViewItem(m_view->serverList, tmp, + tm = new TQListViewItem(m_view->serverList, tmp, "a","a","a","a","a"); } @@ -1783,7 +1783,7 @@ void tork::optionsPreferences() } -void tork::openConfig(const QCString& page) +void tork::openConfig(const TQCString& page) { copyOldConfig(); @@ -1813,7 +1813,7 @@ void tork::openConfig(const QCString& page) } -void tork::updateTrayIcon(const QString& iconName) +void tork::updateTrayIcon(const TQString& iconName) { kdDebug() << "show icon " << iconName << endl; @@ -1826,8 +1826,8 @@ void tork::updateTrayIcon(const QString& iconName) if (TorkConfig::clientOnly()) return; - QPixmap icon = KSystemTray::loadIcon( iconName ); - QPixmap overlay = KSystemTray::loadIcon( "tork_server" ); + TQPixmap icon = KSystemTray::loadIcon( iconName ); + TQPixmap overlay = KSystemTray::loadIcon( "tork_server" ); if ( !overlay.isNull() ) { @@ -1835,9 +1835,9 @@ void tork::updateTrayIcon(const QString& iconName) int y = icon.height() - overlay.height(); if ( icon.mask() ) { - QBitmap mask = *icon.mask(); + TQBitmap mask = *icon.mask(); bitBlt( &mask, x, y, - overlay.mask() ? const_cast<QBitmap *>(overlay.mask()) : &overlay, + overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay, 0, 0, overlay.width(), overlay.height(), overlay.mask() ? OrROP : SetROP ); icon.setMask(mask); @@ -1850,30 +1850,30 @@ void tork::updateTrayIcon(const QString& iconName) } -void tork::updateTrayStats(const QString& totin,const QString& totout, const QString& in,const QString& out) +void tork::updateTrayStats(const TQString& totin,const TQString& totout, const TQString& in,const TQString& out) { if (client == 0L) return; - QStringList cli = client->currentClientReport(); - QStringList server = client->currentServerReport(); + TQStringList cli = client->currentClientReport(); + TQStringList server = client->currentServerReport(); _tray->updateStats(totin, totout, in, out, server, cli, BytesPerSecToString(client->getCurBandwidthRate())); - QString tmp1 = i18n("Transferred up: %1 / down: %2") + TQString tmp1 = i18n("Transferred up: %1 / down: %2") .arg(totout) .arg(totin); m_statusTransfer->setText(tmp1); updateServerClientStatusBar(cli,server); } -void tork::updateServerClientStatusBar(const QStringList &client, const QStringList &server) +void tork::updateServerClientStatusBar(const TQStringList &client, const TQStringList &server) { static unsigned int iter = 0; unsigned int serverCount = server.count(); if (iter > serverCount){ iter = 0; - QString tmp1 = i18n("Client: %1") + TQString tmp1 = i18n("Client: %1") .arg(client[0]); m_statusInfo->setText(tmp1.replace("<font color='#990000'>","") .replace("</font>","")); @@ -1885,7 +1885,7 @@ void tork::updateServerClientStatusBar(const QStringList &client, const QStringL iter = serverCount; return; } - m_statusInfo->setText(QString("Server: %1").arg(server[iter]) + m_statusInfo->setText(TQString("Server: %1").arg(server[iter]) .replace("<font color='#990000'>","") .replace("</font>","")); iter++; @@ -1893,24 +1893,24 @@ void tork::updateServerClientStatusBar(const QStringList &client, const QStringL } -void tork::changeStatusbar(const QString& in,const QString& out) +void tork::changeStatusbar(const TQString& in,const TQString& out) { if ((in == "zero") && (out =="zero")){ - QString tmp1 = i18n("Transferred up: 0 B / down: 0 B"); + TQString tmp1 = i18n("Transferred up: 0 B / down: 0 B"); m_statusTransfer->setText(tmp1); } } -void tork::sayWhatImDoing(const QString& text) +void tork::sayWhatImDoing(const TQString& text) { // display the text on the caption m_statusInfo->setText(text); } -void tork::changeCaption(const QString& text) +void tork::changeCaption(const TQString& text) { // display the text on the caption setCaption(text); @@ -1925,7 +1925,7 @@ void tork::startTor() return; m_list.clear(); - if (TorkConfig::torLocation().isEmpty() || (!QFile::exists(TorkConfig::torLocation()))){ + if (TorkConfig::torLocation().isEmpty() || (!TQFile::exists(TorkConfig::torLocation()))){ processWarning( "notorexecutable",i18n("You can't find me.") ); return; @@ -1936,7 +1936,7 @@ void tork::startTor() childproc = new KProcIO(); childproc->setUseShell(TRUE); - QString torConfFile = writeConf(); + TQString torConfFile = writeConf(); @@ -2013,7 +2013,7 @@ void tork::stopTor() //Reset Country filter menu to 'All' checked - for ( QMap<QString, KPopupMenu*>::Iterator menu = continentMapList.begin(); menu != continentMapList.end(); ++menu ){ + for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMapList.begin(); menu != continentMapList.end(); ++menu ){ for (unsigned int index = 0; index != menu.data()->count(); ++index){ menu.data()->setItemChecked( menu.data()->idAt(index), false ); } @@ -2028,7 +2028,7 @@ void tork::stopTor() //Reset Pseudonymity filter menu to 'All' checked - for ( QMap<QString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu ) + for ( TQMap<TQString, KPopupMenu*>::Iterator menu = continentMap.begin(); menu != continentMap.end(); ++menu ) { for (unsigned int index = 0; index != menu.data()->count(); ++index){ menu.data()->setItemChecked( menu.data()->idAt(index),false); @@ -2059,70 +2059,70 @@ void tork::stopController() disconnect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor())); disconnect( client, SIGNAL(torConnectionClosed()), this, SLOT(torClosedConnection()) ); - disconnect( client, SIGNAL(streamStatusUpdate(const QString &, const QString &, - const QString &, const QString &, const QString &)), - m_view,SLOT(streamStatusUpdated(const QString &, const QString &, - const QString &, const QString &, const QString &)) ); - disconnect( client, SIGNAL(ORStatusUpdate(const QString &, const QString &)), - m_view,SLOT(ORStatusUpdated(const QString &, const QString &)) ); - disconnect( client, SIGNAL(guardStatusUpdate(const QString &, const QString &)), - m_view,SLOT(guardStatusUpdated(const QString &, const QString &)) ); - disconnect( client, SIGNAL(circuitStatusUpdate(const QString &, const QString &, - const QString &, const QString &)), - m_view,SLOT(circuitStatusUpdated(const QString &, const QString &, - const QString &, const QString &)) ); - disconnect( client, SIGNAL(infoUpdate(const QString &,const QString &, const QString &)), - this,SLOT(infoUpdated(const QString &,const QString &, const QString &)) ); - disconnect( client, SIGNAL(bwUpdate(const QString &,const QString &)), - m_view,SLOT(bwUpdated(const QString &,const QString &)) ); - disconnect( client, SIGNAL(streamBwUpdate(const QString &,const QString &,const QString &)), - m_view,SLOT(streamBwUpdated(const QString &,const QString &,const QString &)) ); - - disconnect( client, SIGNAL(updateActiveServers(const QStringList &)), - m_view,SLOT(activeServersUpdated(const QStringList &)) ); - disconnect( client, SIGNAL(updateServerStatus(const QString &,const QString &, - const QString &,const QString &)), - m_view,SLOT(serverStatusUpdated(const QString &,const QString &, - const QString &,const QString &)) ); - - disconnect( client, SIGNAL(setTorCaption(const QString &)), - this,SLOT(setTorCaption(const QString &)) ); - - - disconnect(m_view->circuitList, SIGNAL(attach(const QString &,const QString &)), - client, SLOT(attemptAttach(const QString &,const QString & )) ); - disconnect(m_view->circuitList, SIGNAL(extendCircuit(const QString &, const QString &, bool)), - client, SLOT(attemptExtendCircuit(const QString &, const QString &, bool)) ); - disconnect(m_view->circuitList, SIGNAL(createCircuit(const QString &, bool)), - client, SLOT(attemptCreateCircuit(const QString &, bool)) ); - - - disconnect( m_view->serverList, SIGNAL(mouseButtonPressed (int, QListViewItem *, - const QPoint &, int)), this, SLOT(slotOnItem ( int, QListViewItem *, - const QPoint &, int ))); - disconnect( m_view->ORList, SIGNAL(pressed ( QListViewItem * )), this, - SLOT(slotOnORItem ( QListViewItem * ))); - - - disconnect(m_view->m_osd, SIGNAL(closeStream(const QString &)), - client, SLOT(attemptCloseStream(const QString & )) ); - disconnect(m_view, SIGNAL(closeStream(const QString &)), - client, SLOT(attemptCloseStream(const QString & )) ); + disconnect( client, SIGNAL(streamStatusUpdate(const TQString &, const TQString &, + const TQString &, const TQString &, const TQString &)), + m_view,SLOT(streamStatusUpdated(const TQString &, const TQString &, + const TQString &, const TQString &, const TQString &)) ); + disconnect( client, SIGNAL(ORStatusUpdate(const TQString &, const TQString &)), + m_view,SLOT(ORStatusUpdated(const TQString &, const TQString &)) ); + disconnect( client, SIGNAL(guardStatusUpdate(const TQString &, const TQString &)), + m_view,SLOT(guardStatusUpdated(const TQString &, const TQString &)) ); + disconnect( client, SIGNAL(circuitStatusUpdate(const TQString &, const TQString &, + const TQString &, const TQString &)), + m_view,SLOT(circuitStatusUpdated(const TQString &, const TQString &, + const TQString &, const TQString &)) ); + disconnect( client, SIGNAL(infoUpdate(const TQString &,const TQString &, const TQString &)), + this,SLOT(infoUpdated(const TQString &,const TQString &, const TQString &)) ); + disconnect( client, SIGNAL(bwUpdate(const TQString &,const TQString &)), + m_view,SLOT(bwUpdated(const TQString &,const TQString &)) ); + disconnect( client, SIGNAL(streamBwUpdate(const TQString &,const TQString &,const TQString &)), + m_view,SLOT(streamBwUpdated(const TQString &,const TQString &,const TQString &)) ); + + disconnect( client, SIGNAL(updateActiveServers(const TQStringList &)), + m_view,SLOT(activeServersUpdated(const TQStringList &)) ); + disconnect( client, SIGNAL(updateServerStatus(const TQString &,const TQString &, + const TQString &,const TQString &)), + m_view,SLOT(serverStatusUpdated(const TQString &,const TQString &, + const TQString &,const TQString &)) ); + + disconnect( client, SIGNAL(setTorCaption(const TQString &)), + this,SLOT(setTorCaption(const TQString &)) ); + + + disconnect(m_view->circuitList, SIGNAL(attach(const TQString &,const TQString &)), + client, SLOT(attemptAttach(const TQString &,const TQString & )) ); + disconnect(m_view->circuitList, SIGNAL(extendCircuit(const TQString &, const TQString &, bool)), + client, SLOT(attemptExtendCircuit(const TQString &, const TQString &, bool)) ); + disconnect(m_view->circuitList, SIGNAL(createCircuit(const TQString &, bool)), + client, SLOT(attemptCreateCircuit(const TQString &, bool)) ); + + + disconnect( m_view->serverList, SIGNAL(mouseButtonPressed (int, TQListViewItem *, + const TQPoint &, int)), this, SLOT(slotOnItem ( int, TQListViewItem *, + const TQPoint &, int ))); + disconnect( m_view->ORList, SIGNAL(pressed ( TQListViewItem * )), this, + SLOT(slotOnORItem ( TQListViewItem * ))); + + + disconnect(m_view->m_osd, SIGNAL(closeStream(const TQString &)), + client, SLOT(attemptCloseStream(const TQString & )) ); + disconnect(m_view, SIGNAL(closeStream(const TQString &)), + client, SLOT(attemptCloseStream(const TQString & )) ); disconnect(m_view, SIGNAL(attachStreams(bool)), client, SLOT(attemptAttachStreams( bool )) ); - disconnect(m_view, SIGNAL(closeCircuit(const QString &)), - client, SLOT(attemptCloseCircuit(const QString & )) ); - disconnect(m_view, SIGNAL(closeAllCircuits( QListView* &)), - client, SLOT(closeAllCircuits( QListView* & )) ); + disconnect(m_view, SIGNAL(closeCircuit(const TQString &)), + client, SLOT(attemptCloseCircuit(const TQString & )) ); + disconnect(m_view, SIGNAL(closeAllCircuits( TQListView* &)), + client, SLOT(closeAllCircuits( TQListView* & )) ); - disconnect(client, SIGNAL(displayError(const QString &, const QString &)), - m_view, SLOT(displayError(const QString &,const QString & )) ); - disconnect(client, SIGNAL(displayServer(const QString &, const QString &)), - m_view, SLOT(displayServer(const QString &,const QString & )) ); + disconnect(client, SIGNAL(displayError(const TQString &, const TQString &)), + m_view, SLOT(displayError(const TQString &,const TQString & )) ); + disconnect(client, SIGNAL(displayServer(const TQString &, const TQString &)), + m_view, SLOT(displayServer(const TQString &,const TQString & )) ); - disconnect(client, SIGNAL(whatImDoing(const QString &)), - this, SLOT(sayWhatImDoing(const QString & )) ); + disconnect(client, SIGNAL(whatImDoing(const TQString &)), + this, SLOT(sayWhatImDoing(const TQString & )) ); disconnect(client, SIGNAL(copyOldConfig()), this, SLOT(copyOldConfig()) ); @@ -2132,8 +2132,8 @@ void tork::stopController() disconnect(client, SIGNAL(makeTorkStoppable()), this, SLOT(makeTorkStoppable()) ); - disconnect(m_view->streamList, SIGNAL(attach(const QString &,const QString &)), - client, SLOT(attemptAttach(const QString &,const QString & )) ); + disconnect(m_view->streamList, SIGNAL(attach(const TQString &,const TQString &)), + client, SLOT(attemptAttach(const TQString &,const TQString & )) ); disconnect(client, SIGNAL(warnNoServerInfo()), this, SLOT(warnNoServerInfo()) ); @@ -2164,22 +2164,22 @@ void tork::stopController() disconnect( m_view, SIGNAL(signalCheckBWSettings()), this, SLOT( checkBandwidthSettings() ) ); - disconnect(client, SIGNAL(processWarning(const QString& , const QString& )), - this, SLOT(processWarning(const QString& , const QString& ))); - disconnect(client, SIGNAL(processQuestion(const QString& , const QString& )), - this, SLOT(processQuestion(const QString& , const QString& ))); + disconnect(client, SIGNAL(processWarning(const TQString& , const TQString& )), + this, SLOT(processWarning(const TQString& , const TQString& ))); + disconnect(client, SIGNAL(processQuestion(const TQString& , const TQString& )), + this, SLOT(processQuestion(const TQString& , const TQString& ))); - disconnect(client, SIGNAL(updateTrayIcon(const QString&)), - this, SLOT(updateTrayIcon(const QString&))); + disconnect(client, SIGNAL(updateTrayIcon(const TQString&)), + this, SLOT(updateTrayIcon(const TQString&))); - disconnect( client, SIGNAL(showServerBW(const QString&)), - m_view, SLOT( showServerBW(const QString&) ) ); + disconnect( client, SIGNAL(showServerBW(const TQString&)), + m_view, SLOT( showServerBW(const TQString&) ) ); - disconnect( m_view, SIGNAL(resolveAddress(const QString&)), - client, SLOT( resolveAddress(const QString&) ) ); + disconnect( m_view, SIGNAL(resolveAddress(const TQString&)), + client, SLOT( resolveAddress(const TQString&) ) ); - disconnect( client, SIGNAL(resolvedAddress(const QString&)), - m_view, SLOT( resolvedAddress(const QString&) ) ); + disconnect( client, SIGNAL(resolvedAddress(const TQString&)), + m_view, SLOT( resolvedAddress(const TQString&) ) ); if (bwtimer != 0L){ disconnect( bwtimer, SIGNAL( timeout() ), m_view, SLOT( reportBW() ) ); @@ -2218,13 +2218,13 @@ void tork::stopController() _tray->updateStats(BytesPerSecToString(0),BytesPerSecToString(0), BytesPerSecToString(0),BytesPerSecToString(0), - QStringList("<font color='#990000'>Status Not Known</font>"), - QStringList("<font color='#990000'>Status Not Known</font>"), + TQStringList("<font color='#990000'>Status Not Known</font>"), + TQStringList("<font color='#990000'>Status Not Known</font>"), BytesPerSecToString(0)); } -QString tork::writeConf() +TQString tork::writeConf() { if (tfTor != 0L) delete tfTor; @@ -2234,11 +2234,11 @@ QString tork::writeConf() if ( tfTor->status() != 0 ) { tfTor->close(); KMessageBox::information (this,"KMFilterActionWithCommand: Could not create temp file!"); - return QString(); + return TQString(); } - QTextStream &ts = *(tfTor->textStream()); + TQTextStream &ts = *(tfTor->textStream()); switch (TorkConfig::quickConfigure()) { case 0 : //Tor client and server with default settings @@ -2334,21 +2334,21 @@ QString tork::writeConf() } -void tork::writeCustomOptions2(QTextStream &ts) +void tork::writeCustomOptions2(TQTextStream &ts) { //Add any new servers to excludeNodes that we want excluded by Country - QStringList existingServers = TorkConfig::serversHistory(); - QStringList currentExcludeNodes = TorkConfig::excludeNodes(); - for ( QStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) + TQStringList existingServers = TorkConfig::serversHistory(); + TQStringList currentExcludeNodes = TorkConfig::excludeNodes(); + for ( TQStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) { if ((*it).isEmpty()) continue; int cc = (*it).section("-",0,0).toInt(); - QString nick = (*it).section("-",1); + TQString nick = (*it).section("-",1); - QString fp = getFPFromFPDigest(nick); + TQString fp = getFPFromFPDigest(nick); if (fp.isEmpty()) continue; @@ -2367,22 +2367,22 @@ void tork::writeCustomOptions2(QTextStream &ts) kdDebug() << (*it)->name() << endl; if (elementShouldBeUsed((*it))){ if (noSpecialProcessing((*it), ts)){ - if ( (*it)->property().type() == QVariant::String ) { + if ( (*it)->property().type() == TQVariant::String ) { if (!((*it)->property().toString()).isEmpty()){ ( ts << (*it)->name() << " " << (*it)->property().toString() << "\n"); kdDebug() << (*it)->name() << " " << (*it)->property().toString() << endl; } - }else if ( (*it)->property().type() == QVariant::StringList ) { + }else if ( (*it)->property().type() == TQVariant::StringList ) { if (!((*it)->property().toStringList()).isEmpty()){ ( ts << (*it)->name() << " " << (*it)->property().toStringList().join(",") << "\n"); } - }else if ( (*it)->property().type() == QVariant::Int ) { + }else if ( (*it)->property().type() == TQVariant::Int ) { if (((*it)->property().toInt()) > 0){ ( ts << (*it)->name() << " " << (*it)->property().toString() << "\n"); kdDebug() << (*it)->name() << " " << (*it)->property().toString() << endl; } - }else if ( (*it)->property().type() == QVariant::Bool ) { + }else if ( (*it)->property().type() == TQVariant::Bool ) { if (((*it)->property().toInt()) > 0){ ( ts << (*it)->name() << " " << (*it)->property().toInt() << "\n"); kdDebug() << (*it)->name() << " " << (*it)->property().toInt() << endl; @@ -2391,7 +2391,7 @@ void tork::writeCustomOptions2(QTextStream &ts) } } - //if ( p.type() == QVariant::Bool ) { + //if ( p.type() == TQVariant::Bool ) { } @@ -2425,7 +2425,7 @@ bool tork::elementShouldBeUsed(const KConfigSkeletonItem* it) return false; } -bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) +bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, TQTextStream &ts) { if (((*it).name() == "DirListenAddress") || @@ -2480,8 +2480,8 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) if ((*it).name() == "SOCKSBindAddressMany"){ if (!TorkConfig::sOCKSBindAddressMany().isEmpty()){ - QStringList socksbind = TorkConfig::sOCKSBindAddressMany(); - for ( QStringList::Iterator it = (socksbind).begin(); it != (socksbind).end(); it++ ) + TQStringList socksbind = TorkConfig::sOCKSBindAddressMany(); + for ( TQStringList::Iterator it = (socksbind).begin(); it != (socksbind).end(); it++ ) { if ((*it).isEmpty()) continue; @@ -2493,7 +2493,7 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) if ((*it).name() == "HashedControlPassword"){ if (!TorkConfig::hashedControlPassword().isEmpty()){ - QString hash = hashPassword(TorkConfig::hashedControlPassword()); + TQString hash = hashPassword(TorkConfig::hashedControlPassword()); if(!hash.isEmpty()) ts << "HashedControlPassword 16:" << hash << "\n" ; } @@ -2510,8 +2510,8 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) } if ((*it).name() == "HiddenServices"){ - QStringList hiddenServices = TorkConfig::hiddenServices(); - for ( QStringList::Iterator it = (hiddenServices).begin(); it != (hiddenServices).end(); it++ ) + TQStringList hiddenServices = TorkConfig::hiddenServices(); + for ( TQStringList::Iterator it = (hiddenServices).begin(); it != (hiddenServices).end(); it++ ) { if ((*it).isEmpty()) continue; @@ -2523,8 +2523,8 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) if ((*it).name() == "Bridge"){ - QStringList bridges = TorkConfig::bridge(); - for ( QStringList::Iterator it = (bridges).begin(); it != (bridges).end(); it++ ) + TQStringList bridges = TorkConfig::bridge(); + for ( TQStringList::Iterator it = (bridges).begin(); it != (bridges).end(); it++ ) { if ((*it).isEmpty()) continue; @@ -2536,13 +2536,13 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) if ((*it).name() == "MyFamily"){ - QStringList family = TorkConfig::myFamily(); - QStringList allfamily; - for ( QStringList::Iterator it = (family).begin(); it != (family).end(); it++ ) + TQStringList family = TorkConfig::myFamily(); + TQStringList allfamily; + for ( TQStringList::Iterator it = (family).begin(); it != (family).end(); it++ ) { if ((*it).isEmpty()) continue; - QString node = "$"+getFPFromFPDigest((*it).section("-",1,1)); + TQString node = "$"+getFPFromFPDigest((*it).section("-",1,1)); allfamily.append(node) ; } ts << "MyFamily " << allfamily.join(",") << "\n"; @@ -2551,13 +2551,13 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) } if ((*it).name() == "MapAddress"){ - QStringList maps = TorkConfig::mapAddress(); - for ( QStringList::Iterator it = (maps).begin(); + TQStringList maps = TorkConfig::mapAddress(); + for ( TQStringList::Iterator it = (maps).begin(); it != (maps).end(); it++ ) { if ((*it).isEmpty()) continue; - QString mapAddress = QString("\"%2\"").arg((*it)); + TQString mapAddress = TQString("\"%2\"").arg((*it)); ts << "MapAddress " << mapAddress << "\n"; } return false; @@ -2567,13 +2567,13 @@ bool tork::noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts) } -QString tork::doHashPassword() +TQString tork::doHashPassword() { hashproc = new KProcIO(); hashproc->setUseShell(TRUE); m_hashedpassword = ""; - QString hashCommand=QString("tor --hash-password %1").arg(TorkConfig::hashedControlPassword()); + TQString hashCommand=TQString("tor --hash-password %1").arg(TorkConfig::hashedControlPassword()); *hashproc<<hashCommand; @@ -2589,7 +2589,7 @@ QString tork::doHashPassword() void tork::processHashProc(KProcIO *hashproc) { - QString item = ""; + TQString item = ""; int pos; while ((pos = (hashproc->readln(item,true))) != -1) { @@ -2642,7 +2642,7 @@ void tork::privoxyExited() privoxyproc = 0L; } - QString question; + TQString question; if (stillStarting) question = "privoxycouldntstart"; else @@ -2692,7 +2692,7 @@ void tork::startEverything() void tork::checkForSystemManagedPrivoxy() { - QString host; + TQString host; int port; host = TorkConfig::konqHttpProxy(); @@ -2734,7 +2734,7 @@ void tork::startPrivoxy() { stillStarting = true; - QTimer::singleShot( 20000, this, SLOT(startingPeriodOver()) ); + TQTimer::singleShot( 20000, this, SLOT(startingPeriodOver()) ); if (TorkConfig::systemProxy()) { checkForSystemManagedPrivoxy(); @@ -2757,18 +2757,18 @@ void tork::startPrivoxy() privoxyproc = new KProcIO(); privoxyproc->setUseShell(TRUE); - QString curpath = (QString) getenv("PATH"); + TQString curpath = (TQString) getenv("PATH"); privoxyproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"); - QString location = getenv("HOME"); + TQString location = getenv("HOME"); location += "/.tork"; - QDir torkdir(location); + TQDir torkdir(location); if (!torkdir.exists() && !torkdir.mkdir(location)) location = getenv("HOME"); - QString privoxypid = QString("%1/.tork/privoxypid").arg(location); - QString privoxyConfFile = writePrivoxyConf(); + TQString privoxypid = TQString("%1/.tork/privoxypid").arg(location); + TQString privoxyConfFile = writePrivoxyConf(); *privoxyproc << TorkConfig::privoxyLocation() << " --user " << getenv("USER") << " --no-daemon --pidfile " << privoxypid << " " << privoxyConfFile; @@ -2786,7 +2786,7 @@ void tork::startingPeriodOver() stillStarting = false; } -QString tork::writePrivoxyConf() +TQString tork::writePrivoxyConf() { if (tfPrivoxy != 0L) @@ -2801,7 +2801,7 @@ QString tork::writePrivoxyConf() } - QTextStream &ts = *(tfPrivoxy->textStream()); + TQTextStream &ts = *(tfPrivoxy->textStream()); ts << "forward-socks4a / " << TorkConfig::sOCKSBindAddressHost() << ":" << TorkConfig::sOCKSBindAddressPort() << " ." << "\n"; @@ -2833,7 +2833,7 @@ void tork::startController() { - QString host; + TQString host; int port; if (TorkConfig::quickConfigure() == 6){ @@ -2846,75 +2846,75 @@ void tork::startController() host = "localhost"; port = TorkConfig::controlPort(); } - torCaption = QString("%1:%2").arg(host).arg(port); + torCaption = TQString("%1:%2").arg(host).arg(port); client = new TorClient(host,port); setCaption(torCaption); connect( client, SIGNAL(fatalError()),this, SLOT(cannotContactTor())); connect( client, SIGNAL(torConnectionClosed()), SLOT(torClosedConnection()) ); - connect( client, SIGNAL(streamStatusUpdate(const QString &, const QString &, - const QString &, const QString &, const QString &)), - m_view,SLOT(streamStatusUpdated(const QString &, const QString &, - const QString &, const QString &, const QString &)) ); - connect( client, SIGNAL(ORStatusUpdate(const QString &, const QString &)), - m_view,SLOT(ORStatusUpdated(const QString &, const QString &)) ); - connect( client, SIGNAL(guardStatusUpdate(const QString &, const QString &)), - m_view,SLOT(guardStatusUpdated(const QString &, const QString &)) ); - connect( client, SIGNAL(circuitStatusUpdate(const QString &, const QString &, - const QString &, const QString &)), - m_view,SLOT(circuitStatusUpdated(const QString &, const QString &, - const QString &, const QString &)) ); - connect( client, SIGNAL(infoUpdate(const QString &,const QString &, const QString &)), - this,SLOT(infoUpdated(const QString &,const QString &, const QString &)) ); - connect( client, SIGNAL(bwUpdate(const QString &,const QString &)), - m_view,SLOT(bwUpdated(const QString &,const QString &)) ); - connect( client, SIGNAL(streamBwUpdate(const QString &,const QString &,const QString &)), - m_view,SLOT(streamBwUpdated(const QString &,const QString &,const QString &)) ); - - connect( client, SIGNAL(updateActiveServers(const QStringList &)), - m_view,SLOT(activeServersUpdated(const QStringList &)) ); - connect( client, SIGNAL(updateServerStatus(const QString &,const QString &, - const QString &,const QString &)), - m_view,SLOT(serverStatusUpdated(const QString &,const QString &, - const QString &,const QString &)) ); - - connect( client, SIGNAL(setTorCaption(const QString &)), - this,SLOT(setTorCaption(const QString &)) ); - - - connect(m_view->circuitList, SIGNAL(attach(const QString &,const QString &)), - client, SLOT(attemptAttach(const QString &,const QString & )) ); - connect(m_view->circuitList, SIGNAL(extendCircuit(const QString &, const QString &, bool)), - client, SLOT(attemptExtendCircuit(const QString &, const QString &, bool)) ); - connect(m_view->circuitList, SIGNAL(createCircuit(const QString &, bool)), - client, SLOT(attemptCreateCircuit(const QString &, bool)) ); - - connect( m_view->serverList, SIGNAL(mouseButtonPressed ( int, QListViewItem * , - const QPoint &, int )), - SLOT(slotOnItem ( int, QListViewItem * , const QPoint &, int ))); - connect( m_view->ORList, SIGNAL(pressed ( QListViewItem * )), - SLOT(slotOnORItem ( QListViewItem * ))); - - - connect(m_view->m_osd, SIGNAL(closeStream(const QString &)), - client, SLOT(attemptCloseStream(const QString & )) ); - connect(m_view, SIGNAL(closeStream(const QString &)), - client, SLOT(attemptCloseStream(const QString & )) ); + connect( client, SIGNAL(streamStatusUpdate(const TQString &, const TQString &, + const TQString &, const TQString &, const TQString &)), + m_view,SLOT(streamStatusUpdated(const TQString &, const TQString &, + const TQString &, const TQString &, const TQString &)) ); + connect( client, SIGNAL(ORStatusUpdate(const TQString &, const TQString &)), + m_view,SLOT(ORStatusUpdated(const TQString &, const TQString &)) ); + connect( client, SIGNAL(guardStatusUpdate(const TQString &, const TQString &)), + m_view,SLOT(guardStatusUpdated(const TQString &, const TQString &)) ); + connect( client, SIGNAL(circuitStatusUpdate(const TQString &, const TQString &, + const TQString &, const TQString &)), + m_view,SLOT(circuitStatusUpdated(const TQString &, const TQString &, + const TQString &, const TQString &)) ); + connect( client, SIGNAL(infoUpdate(const TQString &,const TQString &, const TQString &)), + this,SLOT(infoUpdated(const TQString &,const TQString &, const TQString &)) ); + connect( client, SIGNAL(bwUpdate(const TQString &,const TQString &)), + m_view,SLOT(bwUpdated(const TQString &,const TQString &)) ); + connect( client, SIGNAL(streamBwUpdate(const TQString &,const TQString &,const TQString &)), + m_view,SLOT(streamBwUpdated(const TQString &,const TQString &,const TQString &)) ); + + connect( client, SIGNAL(updateActiveServers(const TQStringList &)), + m_view,SLOT(activeServersUpdated(const TQStringList &)) ); + connect( client, SIGNAL(updateServerStatus(const TQString &,const TQString &, + const TQString &,const TQString &)), + m_view,SLOT(serverStatusUpdated(const TQString &,const TQString &, + const TQString &,const TQString &)) ); + + connect( client, SIGNAL(setTorCaption(const TQString &)), + this,SLOT(setTorCaption(const TQString &)) ); + + + connect(m_view->circuitList, SIGNAL(attach(const TQString &,const TQString &)), + client, SLOT(attemptAttach(const TQString &,const TQString & )) ); + connect(m_view->circuitList, SIGNAL(extendCircuit(const TQString &, const TQString &, bool)), + client, SLOT(attemptExtendCircuit(const TQString &, const TQString &, bool)) ); + connect(m_view->circuitList, SIGNAL(createCircuit(const TQString &, bool)), + client, SLOT(attemptCreateCircuit(const TQString &, bool)) ); + + connect( m_view->serverList, SIGNAL(mouseButtonPressed ( int, TQListViewItem * , + const TQPoint &, int )), + SLOT(slotOnItem ( int, TQListViewItem * , const TQPoint &, int ))); + connect( m_view->ORList, SIGNAL(pressed ( TQListViewItem * )), + SLOT(slotOnORItem ( TQListViewItem * ))); + + + connect(m_view->m_osd, SIGNAL(closeStream(const TQString &)), + client, SLOT(attemptCloseStream(const TQString & )) ); + connect(m_view, SIGNAL(closeStream(const TQString &)), + client, SLOT(attemptCloseStream(const TQString & )) ); connect(m_view, SIGNAL(attachStreams(bool)), client, SLOT(attemptAttachStreams( bool )) ); - connect(m_view, SIGNAL(closeCircuit(const QString &)), - client, SLOT(attemptCloseCircuit(const QString & )) ); - connect(m_view, SIGNAL(closeAllCircuits( QListView* &)), - client, SLOT(closeAllCircuits( QListView* & )) ); + connect(m_view, SIGNAL(closeCircuit(const TQString &)), + client, SLOT(attemptCloseCircuit(const TQString & )) ); + connect(m_view, SIGNAL(closeAllCircuits( TQListView* &)), + client, SLOT(closeAllCircuits( TQListView* & )) ); - connect(client, SIGNAL(displayError(const QString &, const QString &)), - m_view, SLOT(displayError(const QString &,const QString & )) ); - connect(client, SIGNAL(displayServer(const QString &, const QString &)), - m_view, SLOT(displayServer(const QString &,const QString & )) ); + connect(client, SIGNAL(displayError(const TQString &, const TQString &)), + m_view, SLOT(displayError(const TQString &,const TQString & )) ); + connect(client, SIGNAL(displayServer(const TQString &, const TQString &)), + m_view, SLOT(displayServer(const TQString &,const TQString & )) ); - connect(client, SIGNAL(whatImDoing(const QString &)), - this, SLOT(sayWhatImDoing(const QString & )) ); + connect(client, SIGNAL(whatImDoing(const TQString &)), + this, SLOT(sayWhatImDoing(const TQString & )) ); connect(client, SIGNAL(copyOldConfig()), this, SLOT(copyOldConfig()) ); @@ -2924,8 +2924,8 @@ void tork::startController() connect(client, SIGNAL(makeTorkStoppable()), this, SLOT(makeTorkStoppable()) ); - connect(m_view->streamList, SIGNAL(attach(const QString &,const QString &)), - client, SLOT(attemptAttach(const QString &,const QString & )) ); + connect(m_view->streamList, SIGNAL(attach(const TQString &,const TQString &)), + client, SLOT(attemptAttach(const TQString &,const TQString & )) ); connect(client, SIGNAL(warnNoServerInfo()), this, SLOT(warnNoServerInfo()) ); @@ -2956,24 +2956,24 @@ void tork::startController() connect( m_view, SIGNAL(signalCheckBWSettings()), this, SLOT( checkBandwidthSettings() ) ); - connect(client, SIGNAL(processWarning(const QString& , const QString& )), - this, SLOT(processWarning(const QString& , const QString& ))); - connect(client, SIGNAL(processQuestion(const QString& , const QString& )), - this, SLOT(processQuestion(const QString& , const QString& ))); + connect(client, SIGNAL(processWarning(const TQString& , const TQString& )), + this, SLOT(processWarning(const TQString& , const TQString& ))); + connect(client, SIGNAL(processQuestion(const TQString& , const TQString& )), + this, SLOT(processQuestion(const TQString& , const TQString& ))); - connect(client, SIGNAL(updateTrayIcon(const QString&)), - this, SLOT(updateTrayIcon(const QString&))); + connect(client, SIGNAL(updateTrayIcon(const TQString&)), + this, SLOT(updateTrayIcon(const TQString&))); - connect( client, SIGNAL(showServerBW(const QString&)), - m_view, SLOT( showServerBW(const QString&) ) ); + connect( client, SIGNAL(showServerBW(const TQString&)), + m_view, SLOT( showServerBW(const TQString&) ) ); - connect( m_view, SIGNAL(resolveAddress(const QString&)), - client, SLOT( resolveAddress(const QString&) ) ); + connect( m_view, SIGNAL(resolveAddress(const TQString&)), + client, SLOT( resolveAddress(const TQString&) ) ); - connect( client, SIGNAL(resolvedAddress(const QString&)), - m_view, SLOT( resolvedAddress(const QString&) ) ); + connect( client, SIGNAL(resolvedAddress(const TQString&)), + m_view, SLOT( resolvedAddress(const TQString&) ) ); - QTimer::singleShot( 10000, this, SLOT(isControllerWorking()) ); + TQTimer::singleShot( 10000, this, SLOT(isControllerWorking()) ); torkStart->setEnabled(false); m_view->welcomeitem->setEnabled(false); @@ -3038,7 +3038,7 @@ void tork::startFromBeginning() void tork::receivedOutput(KProcIO *) { int pos; - QString item2; + TQString item2; if (!(childproc)) return; @@ -3046,7 +3046,7 @@ void tork::receivedOutput(KProcIO *) while ((childproc) && ((pos = (childproc->readln(item2,true))) != -1)) { if ((pos = (item2.find("Opening Control listener on"))) != -1){ - QTimer::singleShot( 200, this, SLOT(startController()) ); + TQTimer::singleShot( 200, this, SLOT(startController()) ); } int i; for (i = 0; _tork_messages[i].logmessage; ++i) { @@ -3083,7 +3083,7 @@ void tork::receivedOutput(KProcIO *) } -void tork::infoUpdated(const QString &type, const QString &summary, const QString &data) +void tork::infoUpdated(const TQString &type, const TQString &summary, const TQString &data) { int i; @@ -3117,7 +3117,7 @@ void tork::infoUpdated(const QString &type, const QString &summary, const QStrin if (waitingForServers){ if (summary.contains("now have enough directory information")){ waitingForServers = false; - //QTimer::singleShot(20000, client, SLOT(slotCheckTorNet()) ); + //TQTimer::singleShot(20000, client, SLOT(slotCheckTorNet()) ); if (client != 0L) client->slotCheckTorNet(); } @@ -3177,7 +3177,7 @@ void tork::copyCookie() KProcIO *catproc = new KProcIO(); catproc->setUseShell(TRUE); - QString whichCommand= QString( + TQString whichCommand= TQString( "kdesu -c '" "mkdir -p -m 600 %1/.tor;" "cp -u /var/lib/tor/control_auth_cookie %2/.tor/control_auth_cookie;" @@ -3403,14 +3403,14 @@ void tork::toggleKDESettingAndLaunchKonq() } } -void tork::enableKDEAndLaunchKonqWithUrl(const QString &url) +void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url) { if (!TorkConfig::kDEUsesTor()) toggleKDESetting(); if (TorkConfig::kDEUsesTor()){ - KRun::runCommand( QString("konqueror --caption \"Anonymous Browsing Session\" " + KRun::runCommand( TQString("konqueror --caption \"Anonymous Browsing Session\" " "%1").arg(url), "konqueror", "konqueror" ); } @@ -3430,13 +3430,13 @@ void tork::setKDE(bool set) KConfig* config = new KConfig("kioslaverc", false, false); config->setGroup( "Proxy Settings" ); if (set){ - config->writeEntry( "httpProxy", QString("%1:%2") + config->writeEntry( "httpProxy", TQString("%1:%2") .arg(TorkConfig::konqHttpProxy()) .arg(TorkConfig::konqHttpProxyPort()) ); - config->writeEntry( "httpsProxy", QString("%1:%2") + config->writeEntry( "httpsProxy", TQString("%1:%2") .arg(TorkConfig::konqHttpsProxy()) .arg(TorkConfig::konqHttpsProxyPort()) ); - config->writeEntry( "ftpProxy", QString("%1:%2") + config->writeEntry( "ftpProxy", TQString("%1:%2") .arg(TorkConfig::konqFtpProxy()) .arg(TorkConfig::konqFtpProxyPort()) ); config->writeEntry( "ProxyType", "1" ); @@ -3502,10 +3502,10 @@ void tork::setKDE(bool set) // Inform all running io-slaves about the changes... // if we cannot update, ioslaves inform the end user... - if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", QString::null)) + if (!DCOPRef("*", "KIO::Scheduler").send("reparseSlaveConfiguration", TQString::null)) { - QString caption = i18n("Update Failed"); - QString message = i18n("You have to restart the running applications " + TQString caption = i18n("Update Failed"); + TQString message = i18n("You have to restart the running applications " "for these changes to take effect."); KMessageBox::information (this, message, caption); return; @@ -3577,7 +3577,7 @@ void tork::checkForKonqWindow(WId id) } -void tork::showWarning( display_status_t &msg, const QString &headline,const QString &torsaid,const QString &thismeans, const QString &type, const QString &icon, bool always, bool showstopper) +void tork::showWarning( display_status_t &msg, const TQString &headline,const TQString &torsaid,const TQString &thismeans, const TQString &type, const TQString &icon, bool always, bool showstopper) { kdDebug() << "in showwarning" << endl; @@ -3605,10 +3605,10 @@ void tork::showWarning( display_status_t &msg, const QString &headline,const QSt m_msg = &msg; m_tooltip = new KDE::PopupMessage(statusBar(), m_statusInfo, 40000, type ); - QString text = i18n( "<b>%1</b>").arg(headline); - text += QString( "<br>" ) + i18n( "<b>Message: </b> %1" ).arg(torsaid); - text += QString( "<br>" ) + i18n( "<b>This means: </b> %1" ).arg(thismeans); - text += QString( "<br>" ); + TQString text = i18n( "<b>%1</b>").arg(headline); + text += TQString( "<br>" ) + i18n( "<b>Message: </b> %1" ).arg(torsaid); + text += TQString( "<br>" ) + i18n( "<b>This means: </b> %1" ).arg(thismeans); + text += TQString( "<br>" ); //connect(m_tooltip, SIGNAL(yesClicked()),this, SLOT(serverHelp())); @@ -3620,7 +3620,7 @@ void tork::showWarning( display_status_t &msg, const QString &headline,const QSt m_tooltip->setMaskEffect( KDE::PopupMessage::Slide ); m_tooltip->setText( text ); - //QString icon = QString("tork_%1").arg(type).replace(" ","_"); + //TQString icon = TQString("tork_%1").arg(type).replace(" ","_"); m_tooltip->setImage( DesktopIcon( icon, 48 ) ); m_tooltip->move( x(), y() + m_tooltip->height() ); @@ -3631,18 +3631,18 @@ void tork::showWarning( display_status_t &msg, const QString &headline,const QSt KPassivePopup *pop; - QPoint pnt; + TQPoint pnt; pop = new KPassivePopup( kmain->_tray ); pnt = kmain->_tray->pos(); pop->setTimeout(15000); pop->setView( i18n("%1").arg(headline),i18n("See TorK window for details.") ); - pop->show(QPoint(pnt)); + pop->show(TQPoint(pnt)); } } -void tork::askQuestion(display_status_t &msg, const QString &headline,const QString &torsaid,const QString &body,const QString &question,void (tork::*pt2Func)(), const QString &type, const QString &icon, bool persistent, bool showstopper) +void tork::askQuestion(display_status_t &msg, const TQString &headline,const TQString &torsaid,const TQString &body,const TQString &question,void (tork::*pt2Func)(), const TQString &type, const TQString &icon, bool persistent, bool showstopper) { kdDebug() << "in askqeustion" << endl; @@ -3667,10 +3667,10 @@ void tork::askQuestion(display_status_t &msg, const QString &headline,const QStr m_pt2Func = pt2Func; m_tooltip = new KDE::PopupMessage(statusBar(), m_statusInfo, 40000, type ); - QString text = i18n( "<b>%1</b>").arg(headline); - text += QString( "<br>" ) + i18n( "<b>Message: </b> %1" ).arg(torsaid); - text += QString( "<br>" ) + i18n( "<b>Reason: </b> %1" ).arg(body); - text += QString( "<br>" ) + i18n( "%1" ).arg(question); + TQString text = i18n( "<b>%1</b>").arg(headline); + text += TQString( "<br>" ) + i18n( "<b>Message: </b> %1" ).arg(torsaid); + text += TQString( "<br>" ) + i18n( "<b>Reason: </b> %1" ).arg(body); + text += TQString( "<br>" ) + i18n( "%1" ).arg(question); //damn. functions pointers can't be used in slots. i don't have the heart to unroll it atm. connect(m_tooltip, SIGNAL(yesClicked( )), SLOT(slotHandle( ))); @@ -3682,7 +3682,7 @@ void tork::askQuestion(display_status_t &msg, const QString &headline,const QStr m_tooltip->showCounter( true ); m_tooltip->setMaskEffect( KDE::PopupMessage::Slide ); m_tooltip->setText( text ); - //QString icon = QString("tork_%1").arg(type).replace(" ","_").replace("'",""); + //TQString icon = TQString("tork_%1").arg(type).replace(" ","_").replace("'",""); m_tooltip->setImage( DesktopIcon( icon, 48 ) ); m_tooltip->move( x(), y() + m_tooltip->height() ); @@ -3693,12 +3693,12 @@ void tork::askQuestion(display_status_t &msg, const QString &headline,const QStr KPassivePopup *pop; - QPoint pnt; + TQPoint pnt; pop = new KPassivePopup( kmain->_tray ); pnt = kmain->_tray->pos(); pop->setTimeout(15000); pop->setView( i18n("%1").arg(headline),i18n("%1 See TorK window for details.").arg(body) ); - pop->show(QPoint(pnt)); + pop->show(TQPoint(pnt)); } @@ -3869,7 +3869,7 @@ void tork::fixAddressPort() } -void tork::slotOnItem( int button, QListViewItem * item, const QPoint &, int) +void tork::slotOnItem( int button, TQListViewItem * item, const TQPoint &, int) { if ((item == NULL) || (button == 2)) @@ -3880,7 +3880,7 @@ void tork::slotOnItem( int button, QListViewItem * item, const QPoint &, int) } -void tork::slotOnORItem( QListViewItem * item) +void tork::slotOnORItem( TQListViewItem * item) { if (item == NULL) @@ -3905,7 +3905,7 @@ void tork::isControllerWorking( ) if (!client->isControllerWorking()){ processQuestion( "jdsklajdkslajdskla", i18n("TorK can't communicate with Tor on the controller port %1. Do you have something limiting/blocking traffic on that port?").arg(TorkConfig::controlPort()) ); - QTimer::singleShot( 10000, this, SLOT(isControllerWorking()) ); + TQTimer::singleShot( 10000, this, SLOT(isControllerWorking()) ); } @@ -3927,7 +3927,7 @@ void tork::needAlphaVersion( ) void tork::showTip() { - KTipDialog::showTip(this,QString::null,true); + KTipDialog::showTip(this,TQString::null,true); } void tork::showTipOnStart() @@ -3947,9 +3947,9 @@ void tork::startNetStat() netstatproc = new KProcIO(); netstatproc->setUseShell(TRUE); - QString netstatcmd = "netstat -ntucpe"; + TQString netstatcmd = "netstat -ntucpe"; if (!TorkConfig::netstatLocation().isEmpty()) - netstatcmd = QString("%1 -ntucpe").arg(TorkConfig::netstatLocation()); + netstatcmd = TQString("%1 -ntucpe").arg(TorkConfig::netstatLocation()); *netstatproc << netstatcmd; @@ -3984,7 +3984,7 @@ void tork::netStatExited() void tork::receivedNetStatOutput(KProcIO *) { int pos; - QString item2; + TQString item2; // Don't print netstat output if we are running a relay if (!TorkConfig::clientOnly()) @@ -3995,11 +3995,11 @@ void tork::receivedNetStatOutput(KProcIO *) while ((netstatproc) && ((pos = (netstatproc->readln(item2,true))) != -1)) { - QString foreignAddress = item2.mid(44,24); - QString state = item2.mid(68,11); - QString inode = item2.mid(90,11); - QString program = item2.mid(102,19).stripWhiteSpace(); - QListViewItem* nonTorTrafficLine; + TQString foreignAddress = item2.mid(44,24); + TQString state = item2.mid(68,11); + TQString inode = item2.mid(90,11); + TQString program = item2.mid(102,19).stripWhiteSpace(); + TQListViewItem* nonTorTrafficLine; uint tmpents = TorkConfig::nonTorTrafficMaxEntries(); if (inodes.count() > tmpents){ @@ -4017,20 +4017,20 @@ void tork::receivedNetStatOutput(KProcIO *) if ((!item2.left(3).contains("tcp")) && (!item2.left(3).contains("udp"))) continue; - QListViewItem* ba = inodes.find( inode ); + TQListViewItem* ba = inodes.find( inode ); if (ba) continue; - nonTorTrafficLine = new QListViewItem(m_view->NonTorTraffic,QDateTime::currentDateTime ().toString(Qt::ISODate).replace("T"," "), foreignAddress,program,inode); + nonTorTrafficLine = new TQListViewItem(m_view->NonTorTraffic,TQDateTime::currentDateTime ().toString(TQt::ISODate).replace("T"," "), foreignAddress,program,inode); inodes.insert( inode, nonTorTrafficLine ); - QString cleanedTarget = foreignAddress.section(":",0,0).stripWhiteSpace(); - QString cleanedPort = foreignAddress.section(":",1,1).stripWhiteSpace(); - QString iconPath = locate("cache", KMimeType::favIconForURL("http://"+cleanedTarget)+".png"); + TQString cleanedTarget = foreignAddress.section(":",0,0).stripWhiteSpace(); + TQString cleanedPort = foreignAddress.section(":",1,1).stripWhiteSpace(); + TQString iconPath = locate("cache", KMimeType::favIconForURL("http://"+cleanedTarget)+".png"); if (!iconPath.isEmpty()){ - nonTorTrafficLine->setPixmap( 1, QPixmap( iconPath ) ); + nonTorTrafficLine->setPixmap( 1, TQPixmap( iconPath ) ); }else{ int i; for (i = 0; _port_icon[i].port; ++i) { @@ -4046,7 +4046,7 @@ void tork::receivedNetStatOutput(KProcIO *) if ((foreignAddress.contains(":domain")) || (foreignAddress.contains(":53 "))){ m_program = program; - QTimer::singleShot( 3000, this, SLOT(torUsedAfterDNSRequest()) ); + TQTimer::singleShot( 3000, this, SLOT(torUsedAfterDNSRequest()) ); } item2 = ""; @@ -4059,7 +4059,7 @@ void tork::receivedNetStatOutput(KProcIO *) void tork::torUsedAfterDNSRequest() { - if (QTime::currentTime().secsTo(m_view->timeTorWasLastUsed()) > -6){ + if (TQTime::currentTime().secsTo(m_view->timeTorWasLastUsed()) > -6){ processWarning("dnsrequestsdetected",i18n("Shortly before traffic to %1 passed through Tor, the program <b>%2</b> bypassed Tor to turn a domain name to an IP address. Traffic to <b>%3</b> may therefore not be fully anonymous.").arg(m_view->addrTorWasLastUsed()).arg(m_program).arg(m_view->addrTorWasLastUsed())); } @@ -4067,13 +4067,13 @@ void tork::torUsedAfterDNSRequest() } -void tork::processWarning(const QString& type, const QString& text) +void tork::processWarning(const TQString& type, const TQString& text) { int i; for (i = 0; _tork_messages[i].logmessage; ++i) { message_t *msg = &_tork_messages[i]; - if (QString(msg->logmessage).contains(type)){ + if (TQString(msg->logmessage).contains(type)){ if ((*this.*(msg->pt2Member))()){ strncpy(msg->torsaid,text,249); showWarning(msg->state, msg->headline, msg->torsaid, @@ -4085,16 +4085,16 @@ void tork::processWarning(const QString& type, const QString& text) } -void tork::processQuestion(const QString& type, const QString& text) +void tork::processQuestion(const TQString& type, const TQString& text) { - QString tmptext = text; + TQString tmptext = text; tmptext.replace(",",", "); int i; for (i = 0; _tork_questions[i].logquestion; ++i) { question_t *msg = &_tork_questions[i]; if ((*this.*(msg->pt2Member2))()){ - if (QString(msg->logquestion).contains(type)){ + if (TQString(msg->logquestion).contains(type)){ (*this.*msg->silentAction)(); strncpy(msg->torsaid,tmptext,249); askQuestion(msg->state, msg->headline, msg->torsaid, msg->body, @@ -4109,7 +4109,7 @@ void tork::processQuestion(const QString& type, const QString& text) } -void tork::showSecurityNotice(const QString& port) +void tork::showSecurityNotice(const TQString& port) { processQuestion("securitynotice",i18n("Traffic on port %1 is not " @@ -4119,7 +4119,7 @@ void tork::showSecurityNotice(const QString& port) } -void tork::showScreamingNotice(const QString& port) +void tork::showScreamingNotice(const TQString& port) { if (TorkConfig::currentTorVersion().left(3) != "0.1") @@ -4169,7 +4169,7 @@ void tork::useNewIdentity() if (client != 0L){ recentNewIdentityRequest = true; - QTimer::singleShot( 20000, this, SLOT(allowNewIdentityRequests()) ); + TQTimer::singleShot( 20000, this, SLOT(allowNewIdentityRequests()) ); client->newIdentity(); @@ -4182,7 +4182,7 @@ void tork::allowNewIdentityRequests() recentNewIdentityRequest = false; } -void tork::createService(const QString& dir, const QString& port) +void tork::createService(const TQString& dir, const TQString& port) { if (client != 0L) @@ -4212,18 +4212,18 @@ void tork::checkBandwidthSettings( ) return; - QString newBW, newLdBW, nextBW; + TQString newBW, newLdBW, nextBW; int largestCandidateSoFar = -86400, newCandidate = 0, bestCandidate = -86400; int nextScheduledCandidate =0, nextCandidate = 0; int BWDayAsInt = 0; - int TodayAsInt = QDate::currentDate().dayOfWeek(); + int TodayAsInt = TQDate::currentDate().dayOfWeek(); // Get current date/time - QDateTime currentDateTime = QDateTime::currentDateTime(); - QDate nextDate; - QTime nextTime; + TQDateTime currentDateTime = TQDateTime::currentDateTime(); + TQDate nextDate; + TQTime nextTime; - QStringList bandwidthSlots = TorkConfig::bandwidthSlots(); - for ( QStringList::Iterator it = bandwidthSlots.begin(); it != bandwidthSlots.end(); ++it ) + TQStringList bandwidthSlots = TorkConfig::bandwidthSlots(); + for ( TQStringList::Iterator it = bandwidthSlots.begin(); it != bandwidthSlots.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -4233,7 +4233,7 @@ void tork::checkBandwidthSettings( ) BWDayAsInt = TodayAsInt; else{ for (int i=1; i<8;i++){ - if ((*it).section("\n",-4,-4) == QDate::longDayName(i)){ + if ((*it).section("\n",-4,-4) == TQDate::longDayName(i)){ BWDayAsInt = i; break; } @@ -4241,8 +4241,8 @@ void tork::checkBandwidthSettings( ) } //Construct entry's date/time - QDateTime BWDateTime = QDateTime::currentDateTime(); - BWDateTime.setTime(QTime::fromString((*it).section("\n",-5,-5))); + TQDateTime BWDateTime = TQDateTime::currentDateTime(); + BWDateTime.setTime(TQTime::fromString((*it).section("\n",-5,-5))); signed int daysFrom = BWDayAsInt - TodayAsInt; newCandidate = currentDateTime.secsTo(BWDateTime.addDays(daysFrom)); @@ -4292,7 +4292,7 @@ void tork::checkBandwidthSettings( ) (cndBWMax != client->getCurMaxAdvertisedBandwidth())){ client->setBandwidth(newBW.section("\n",-3,-3),newBW.section("\n",-2,-2), newBW.section("\n",-1)); - QTime bwtime = QTime::fromString(nextBW.section("\n",-5,-5)); + TQTime bwtime = TQTime::fromString(nextBW.section("\n",-5,-5)); processWarning( "bwreset",i18n("Tor bandwidth has been reset to: Max Incoming -" " <b>%1 KB/s</b>." " Max Burst - <b>%2 KB/s</b>. Max Advertised - <b>%3 KB/s</b>." @@ -4310,22 +4310,22 @@ void tork::setBandwidthFromSysTray(int rate ) if (client == 0L) return; - client->setBandwidth(QString("%1").arg(rate),QString("%1").arg(rate*2), + client->setBandwidth(TQString("%1").arg(rate),TQString("%1").arg(rate*2), ""); client->getBandwidth(); } -void tork::setTorCaption(const QString& caption) +void tork::setTorCaption(const TQString& caption) { - setCaption(QString("%1 using Tor %2").arg(torCaption).arg(caption)); + setCaption(TQString("%1 using Tor %2").arg(torCaption).arg(caption)); TorkConfig::setCurrentTorVersion(caption); TorkConfig::writeConfig(); if (caption.left(3) == "0.1"){ m_view->streamList->hideColumn(1); m_view->streamList->header()->setResizeEnabled(FALSE, 1); - m_view->streamList->setResizeMode( QListView::NoColumn ); + m_view->streamList->setResizeMode( TQListView::NoColumn ); m_UnCensorButton->unplug( toolBar("TorToolBar") ); m_SecurityButton->unplug( toolBar("MoreToolBar") ); m_ServerButtonMenu->setItemEnabled( 3, false ); @@ -4337,7 +4337,7 @@ void tork::resetTor() { KProcIO *catproc = new KProcIO(); catproc->setUseShell(TRUE); - QString whichCommand= "kdesu -c 'killall -s HUP tor'"; + TQString whichCommand= "kdesu -c 'killall -s HUP tor'"; *catproc<<whichCommand; catproc->start(KProcIO::NotifyOnExit,TRUE); connect( catproc, SIGNAL(processExited(KProcess *)), @@ -4350,13 +4350,13 @@ void tork::resetExited() startEverything(); } -void tork::upnpForwardingOK(kt::UPnPRouter* router,const QString& string, bool fwd) +void tork::upnpForwardingOK(kt::UPnPRouter* router,const TQString& string, bool fwd) { kdDebug() << "UPNPforwardingok" << endl; - QString tmpports = QStringList::split("<NewExternalPort>",string)[1]; - QString extport = QStringList::split("</NewExternalPort>",tmpports)[0]; - tmpports = QStringList::split("<NewInternalPort>",string)[1]; - QString intport = QStringList::split("</NewInternalPort>",tmpports)[0]; + TQString tmpports = TQStringList::split("<NewExternalPort>",string)[1]; + TQString extport = TQStringList::split("</NewExternalPort>",tmpports)[0]; + tmpports = TQStringList::split("<NewInternalPort>",string)[1]; + TQString intport = TQStringList::split("</NewInternalPort>",tmpports)[0]; // if (!(router->forwardedPorts()->contains(net::ForwardPort(443, @@ -4393,13 +4393,13 @@ void tork::upnpForwardingOK(kt::UPnPRouter* router,const QString& string, bool f } -void tork::upnpForwardingError(kt::UPnPRouter* router,const QString& string, bool fwd) +void tork::upnpForwardingError(kt::UPnPRouter* router,const TQString& string, bool fwd) { - QString tmpports = QStringList::split("<NewExternalPort>",string)[1]; - QString extport = QStringList::split("</NewExternalPort>",tmpports)[0]; - tmpports = QStringList::split("<NewInternalPort>",string)[1]; - QString intport = QStringList::split("</NewInternalPort>",tmpports)[0]; + TQString tmpports = TQStringList::split("<NewExternalPort>",string)[1]; + TQString extport = TQStringList::split("</NewExternalPort>",tmpports)[0]; + tmpports = TQStringList::split("<NewInternalPort>",string)[1]; + TQString intport = TQStringList::split("</NewInternalPort>",tmpports)[0]; //Reset the ORPort or DirPort to the non-forwarded value if (extport == "80") @@ -43,7 +43,7 @@ #include <kconfigskeleton.h> #include <kwinmodule.h> #include <kpopupmenu.h> -#include <qvaluevector.h> +#include <ntqvaluevector.h> #include "update.h" #include "trayicon.h" @@ -56,10 +56,10 @@ class KPopupMenu; class KActionMenu; class KURL; class TrayIcon; -class QLabel; +class TQLabel; class KProcIO; class TorClient; -class QPoint; +class TQPoint; class StatGraph; class TorkConfig; class KConfigSkeleton; @@ -71,7 +71,7 @@ class SetMaxRate; class MyHidden; class TestProxy; -//class QValueVector; +//class TQValueVector; /** Enumeration of types which option values can take */ typedef enum display_status_t { @@ -106,14 +106,14 @@ public: torkView *m_view; TrayIcon *_tray; - QDict<QListViewItem> inodes; + TQDict<TQListViewItem> inodes; bool connectedToTor(){return (client!=0) ? true : false;}; KPopupMenu* m_LaunchMenu; void anonymousFirefox(){m_view->anonymousFirefox();}; void anonymousOpera(){m_view->anonymousOpera();}; void anonymousEmail(){m_view->sendAnonymousEmail(); hide();}; - void anonymizedFirefox(const QString & url){m_view->anonymizedFirefox(url);}; - void anonymizedOpera(const QString & url){m_view->anonymizedOpera(url);}; + void anonymizedFirefox(const TQString & url){m_view->anonymizedFirefox(url);}; + void anonymizedOpera(const TQString & url){m_view->anonymizedOpera(url);}; void anonymousKonversation(){torkify( 0 );}; void anonymousKopete(){torkify( 1 );}; void anonymousGaim(){torkify( 2 );}; @@ -123,9 +123,9 @@ public: bool routerDiscovered(){ return m_routerDiscovered;}; void setRouterDiscovered(bool discovered){ m_routerDiscovered = discovered;}; - QStringList getDiscoveredRouters(){ return discoveredRouters;}; + TQStringList getDiscoveredRouters(){ return discoveredRouters;}; void setBandwidthFromSysTray(int rate ); - void enableKDEAndLaunchKonqWithUrl(const QString &); + void enableKDEAndLaunchKonqWithUrl(const TQString &); int upnpORPort(){ return orPort; }; int upnpDirPort(){ return dirPort; }; void setUpnpDirPort(int port){ dirPort=port; }; @@ -152,8 +152,8 @@ private slots: void checkRouterDiscovered( ); - void changeStatusbar(const QString& in,const QString& out); - void changeCaption(const QString& text); + void changeStatusbar(const TQString& in,const TQString& out); + void changeCaption(const TQString& text); void startController(); void stopController(); void receivedOutput(KProcIO *); @@ -164,11 +164,11 @@ private slots: void toggleKDESettingAndLaunchKonq(); void setKDE(bool set); void turnOffKDE(); - void sayWhatImDoing(const QString& ); - void slotOnItem( int, QListViewItem *, const QPoint &, int ); - void slotOnORItem( QListViewItem * ); + void sayWhatImDoing(const TQString& ); + void slotOnItem( int, TQListViewItem *, const TQPoint &, int ); + void slotOnORItem( TQListViewItem * ); void slotOffItem( ); - void openConfig(const QCString& page); + void openConfig(const TQCString& page); void slotHandle(/*TFunctor *functor*/); void noClicked(/*TFunctor *functor*/); @@ -180,7 +180,7 @@ private slots: void hiddenServices(); void mixminionHome(); void networkList(); - void infoUpdated(const QString &type, const QString &summary, const QString &data); + void infoUpdated(const TQString &type, const TQString &summary, const TQString &data); void shuttingDown(); void showMyServer(); void showFirewallEvasion(); @@ -211,17 +211,17 @@ private slots: void populateCountryMenu(); void applyPseudonymity( int country_id ); void checkBandwidthSettings(); - void setTorCaption(const QString &caption); + void setTorCaption(const TQString &caption); void configureServer(int); void configureSecurity( int id ); void updateServerButton( ); void torUsedAfterDNSRequest(); - void updateTrayStats(const QString &,const QString &,const QString &,const QString &); - void updateTrayIcon(const QString &); + void updateTrayStats(const TQString &,const TQString &,const TQString &,const TQString &); + void updateTrayIcon(const TQString &); void resetExited(); void switchMode(); - void upnpForwardingOK(kt::UPnPRouter*,const QString &, bool); - void upnpForwardingError(kt::UPnPRouter*,const QString &, bool); + void upnpForwardingOK(kt::UPnPRouter*,const TQString &, bool); + void upnpForwardingError(kt::UPnPRouter*,const TQString &, bool); void routerDiscovered(kt::UPnPRouter* ); void configureRouter(bool force,bool silent=false); void checkForSystemManagedPrivoxy(); @@ -257,16 +257,16 @@ public slots: void readEavesdropping(); void aboutTorify(); void aboutTor(); - void showSecurityNotice(const QString &port); - void showScreamingNotice(const QString &port); + void showSecurityNotice(const TQString &port); + void showScreamingNotice(const TQString &port); void torClosedConnection(); void makeTorkStoppable(); - void createService(const QString& dir,const QString& port); + void createService(const TQString& dir,const TQString& port); void aboutParanoidMode(); - void processWarning(const QString& type, const QString& text); - void processQuestion(const QString& type, const QString& text); + void processWarning(const TQString& type, const TQString& text); + void processQuestion(const TQString& type, const TQString& text); void updateTorUnstable(); - void currentTabChanged(QWidget* cur ); + void currentTabChanged(TQWidget* cur ); void stopTor(); void resetTor(); void toggleServerButton( bool on ); @@ -280,22 +280,22 @@ public slots: private: void setupAccel(); void setupActions(); - QString writeConf(); - QString writePrivoxyConf(); - void writeCustomOptions(QTextStream &ts); - void writeCustomOptions2(QTextStream &ts); - void showWarning( display_status_t &msg, const QString &headline,const QString &torsaid,const QString &thismeans, const QString &type, const QString &icon, bool always, bool showstopper); - void askQuestion(display_status_t &msg, const QString &headline,const QString &torsaid,const QString &body,const QString &question,void (tork::*pt2Func)(), const QString &type, const QString &icon, bool persistent, bool showstopper); + TQString writeConf(); + TQString writePrivoxyConf(); + void writeCustomOptions(TQTextStream &ts); + void writeCustomOptions2(TQTextStream &ts); + void showWarning( display_status_t &msg, const TQString &headline,const TQString &torsaid,const TQString &thismeans, const TQString &type, const TQString &icon, bool always, bool showstopper); + void askQuestion(display_status_t &msg, const TQString &headline,const TQString &torsaid,const TQString &body,const TQString &question,void (tork::*pt2Func)(), const TQString &type, const TQString &icon, bool persistent, bool showstopper); void processQueue(); bool elementShouldBeUsed(const KConfigSkeletonItem* it); - bool noSpecialProcessing(const KConfigSkeletonItem* it, QTextStream &ts); - QString doHashPassword(); + bool noSpecialProcessing(const KConfigSkeletonItem* it, TQTextStream &ts); + TQString doHashPassword(); bool queryClose(); void prepareToShut(); - void filterViewServers( QValueVector<QString> &possibleValues, QListView* &view, KPopupMenu* &menu, int id, int column ); - void filterView( QValueVector<QString> &possibleValues, QListView* &view, KPopupMenu* &menu, int id, int column ); - QString createFailSafeCommand( const QStringList &filterRules, bool set ); - void updateServerClientStatusBar(const QStringList &client, const QStringList &server); + void filterViewServers( TQValueVector<TQString> &possibleValues, TQListView* &view, KPopupMenu* &menu, int id, int column ); + void filterView( TQValueVector<TQString> &possibleValues, TQListView* &view, KPopupMenu* &menu, int id, int column ); + TQString createFailSafeCommand( const TQStringList &filterRules, bool set ); + void updateServerClientStatusBar(const TQStringList &client, const TQStringList &server); void updateToolBar(); private: @@ -355,9 +355,9 @@ private: KActionMenu* m_SecurityButton; KPopupMenu* m_SecurityButtonMenu; - QLabel* m_statusInfo; - QLabel* m_statusTransfer; - QLabel* m_statusSpeed; + TQLabel* m_statusInfo; + TQLabel* m_statusTransfer; + TQLabel* m_statusSpeed; StatGraph* m_graphIn; StatGraph* m_graphOut; KProcIO* childproc; @@ -368,17 +368,17 @@ private: bool m_servererrornag; bool m_contactinfonag; bool m_serverworking; - QListViewItem* m_prevItem; - QTimer *timer; - QTimer *bwtimer; - QTimer *bwLimitTimer; + TQListViewItem* m_prevItem; + TQTimer *timer; + TQTimer *bwtimer; + TQTimer *bwLimitTimer; void (tork::*m_pt2Func)(); KDE::PopupMessage *m_tooltip; - QStringList m_list; - QString m_body; + TQStringList m_list; + TQString m_body; display_status_t* m_msg; KProcIO *hashproc; - QString m_hashedpassword; + TQString m_hashedpassword; KConfigSkeletonItem::List previtems; KConfigSkeleton pcopy; PrevConfig::PrevConfigList prevlist; @@ -386,12 +386,12 @@ private: KTempFile* tfTor; KTempFile* tfPrivoxy; KWinModule* winModule; - QWidget* prev; + TQWidget* prev; - QValueList<QListViewItem*> ordinaryServerList; - QMap<QString,KPopupMenu*> continentMap; - QMap<QString,KPopupMenu*> continentMapList; - QStringList discoveredRouters; + TQValueList<TQListViewItem*> ordinaryServerList; + TQMap<TQString,KPopupMenu*> continentMap; + TQMap<TQString,KPopupMenu*> continentMapList; + TQStringList discoveredRouters; int filterId; @@ -409,16 +409,16 @@ private: bool m_AppliedSettings; bool m_CanApplyServerSettingsIfSet; - QDialog* dialog; + TQDialog* dialog; MyHidden* myHiddenDialog; - QDialog* serverdialog; + TQDialog* serverdialog; UPnPManager* upnpmanager; ForwardPortList* forwardPortList; - QString filterError; - QString torCaption; - QString m_program; + TQString filterError; + TQString torCaption; + TQString m_program; SetMaxRate* m_set_max_rate; diff --git a/src/torkactivelabel.cpp b/src/torkactivelabel.cpp index b76876b..1fae5a2 100644 --- a/src/torkactivelabel.cpp +++ b/src/torkactivelabel.cpp @@ -21,20 +21,20 @@ #include "torkactivelabel.h" #include "kdebug.h" -#include <qapplication.h> -#include <qheader.h> +#include <ntqapplication.h> +#include <ntqheader.h> #include <kiconloader.h> #include <klocale.h> #include <kstandarddirs.h> -TorkActiveLabel::TorkActiveLabel( const QString &text,QWidget * parent, const char * name) : +TorkActiveLabel::TorkActiveLabel( const TQString &text,TQWidget * parent, const char * name) : KActiveLabel( text,parent, name ), mousePressed( FALSE ) { } -TorkActiveLabel::TorkActiveLabel( QWidget * parent, const char * name) : +TorkActiveLabel::TorkActiveLabel( TQWidget * parent, const char * name) : KActiveLabel( parent, name ), mousePressed( FALSE ) { @@ -43,7 +43,7 @@ TorkActiveLabel::TorkActiveLabel( QWidget * parent, const char * name) : -void TorkActiveLabel::contentsMousePressEvent( QMouseEvent* e ) +void TorkActiveLabel::contentsMousePressEvent( TQMouseEvent* e ) { thisfont = this->font(); thisfont.setBold(true); @@ -52,7 +52,7 @@ void TorkActiveLabel::contentsMousePressEvent( QMouseEvent* e ) KActiveLabel::contentsMousePressEvent( e ); } -void TorkActiveLabel::contentsMouseMoveEvent( QMouseEvent* e ) +void TorkActiveLabel::contentsMouseMoveEvent( TQMouseEvent* e ) { if (this->frameRect().contains(e->pos())){ @@ -68,7 +68,7 @@ void TorkActiveLabel::contentsMouseMoveEvent( QMouseEvent* e ) KActiveLabel::contentsMouseMoveEvent( e ); } -void TorkActiveLabel::contentsMouseReleaseEvent( QMouseEvent * e) +void TorkActiveLabel::contentsMouseReleaseEvent( TQMouseEvent * e) { thisfont = this->font(); thisfont.setBold(false); @@ -77,7 +77,7 @@ void TorkActiveLabel::contentsMouseReleaseEvent( QMouseEvent * e) } -QPoint TorkActiveLabel::getMousePos() +TQPoint TorkActiveLabel::getMousePos() { return m_mousepos; } diff --git a/src/torkactivelabel.h b/src/torkactivelabel.h index 1ba01c3..04e441e 100644 --- a/src/torkactivelabel.h +++ b/src/torkactivelabel.h @@ -31,22 +31,22 @@ class TorkActiveLabel : public KActiveLabel Q_OBJECT public: - TorkActiveLabel(const QString &text, QWidget *parent, const char *name=0); - TorkActiveLabel(QWidget *parent, const char *name=0); - QPoint m_mousepos; - QPoint getMousePos(); + TorkActiveLabel(const TQString &text, TQWidget *parent, const char *name=0); + TorkActiveLabel(TQWidget *parent, const char *name=0); + TQPoint m_mousepos; + TQPoint getMousePos(); protected: - void contentsMouseMoveEvent( QMouseEvent *e ); - void contentsMousePressEvent( QMouseEvent *e ); - void contentsMouseReleaseEvent( QMouseEvent *e ); + void contentsMouseMoveEvent( TQMouseEvent *e ); + void contentsMousePressEvent( TQMouseEvent *e ); + void contentsMouseReleaseEvent( TQMouseEvent *e ); private: - QPoint presspos; + TQPoint presspos; bool mousePressed; int dropTimer; bool m_recentDrop; - QFont thisfont; + TQFont thisfont; }; diff --git a/src/torkapplet/tork_mnu.cpp b/src/torkapplet/tork_mnu.cpp index b354612..f44912b 100644 --- a/src/torkapplet/tork_mnu.cpp +++ b/src/torkapplet/tork_mnu.cpp @@ -25,9 +25,9 @@ #include <unistd.h> #include <sys/stat.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qstringlist.h> +#include <ntqdir.h> +#include <ntqfileinfo.h> +#include <ntqstringlist.h> #include <kapplication.h> #include <kglobal.h> @@ -49,10 +49,10 @@ K_EXPORT_KICKER_MENUEXT(tork, TorkMenu) -QValueVector<QString> torkifyApp(8); +TQValueVector<TQString> torkifyApp(8); -TorkMenu::TorkMenu(QWidget *parent, const char *name, const QStringList& /* args */) +TorkMenu::TorkMenu(TQWidget *parent, const char *name, const TQStringList& /* args */) : KPanelMenu("", parent, name),m_kdestate(true) { p_dcopServer= new DCOPClient(); @@ -90,7 +90,7 @@ void TorkMenu::initialize() torkifyApp[0] = "Firefox"; torkifyApp[7] = "Email"; - QStringList paths = getProgramList(); + TQStringList paths = getProgramList(); if (paths.contains("firefox")) @@ -160,14 +160,14 @@ void TorkMenu::slotExec(int id) void TorkMenu::anonymousApp(int id) { - QString app = torkifyApp[id]; + TQString app = torkifyApp[id]; app.prepend("anonymous"); if (m_torkrunning){ DCOPRef("tork*", "DCOPTork").send("startEverything"); - DCOPRef("tork*", "DCOPTork").send(QCString(app)); + DCOPRef("tork*", "DCOPTork").send(TQCString(app)); }else - KRun::runCommand( QString("tork --%1").arg(app), "tork", "tork" ); + KRun::runCommand( TQString("tork --%1").arg(app), "tork", "tork" ); } @@ -189,11 +189,11 @@ void TorkMenu::anonymizeKDE() } -QStringList TorkMenu::getProgramList() +TQStringList TorkMenu::getProgramList() { //Check for the existence of anonymizable/helper programs first. - QStringList programList; + TQStringList programList; programList << "firefox" << "kopete" << "gaim" << "pidgin" << "opera" << "konversation"; diff --git a/src/torkapplet/tork_mnu.h b/src/torkapplet/tork_mnu.h index fe49b40..274da88 100644 --- a/src/torkapplet/tork_mnu.h +++ b/src/torkapplet/tork_mnu.h @@ -23,7 +23,7 @@ #ifndef _tork_mnu_h_ #define _tork_mnu_h_ -#include <qvaluevector.h> +#include <ntqvaluevector.h> #include <kpanelmenu.h> #include <klibloader.h> @@ -35,14 +35,14 @@ class TorkMenu : public KPanelMenu/*, public KPReloadObject*/ Q_OBJECT public: - TorkMenu(QWidget *parent, const char *name, const QStringList& /* args */); + TorkMenu(TQWidget *parent, const char *name, const TQStringList& /* args */); ~TorkMenu(); void anonymousApp(int id); void anonymizeKDE(); bool m_kdestate; bool m_torkrunning; DCOPClient* p_dcopServer; - QStringList getProgramList(); + TQStringList getProgramList(); protected slots: void initialize(); void slotExec(int id); diff --git a/src/torkview.cpp b/src/torkview.cpp index eed8c8b..c5e8ed7 100644 --- a/src/torkview.cpp +++ b/src/torkview.cpp @@ -25,8 +25,8 @@ #include "tork.h" #include "torclient.h" #include <klocale.h> -#include <qlabel.h> -#include <qlistview.h> +#include <ntqlabel.h> +#include <ntqlistview.h> #include "dndlistview.h" #include "portsandicons.h" #include "torkconfig.h" @@ -57,12 +57,12 @@ #include <kurl.h> #include <kio/netaccess.h> -#include <qregexp.h> -#include <qsplitter.h> -#include <qgroupbox.h> -#include <qfile.h> -#include <qdir.h> -#include <qpixmap.h> +#include <ntqregexp.h> +#include <ntqsplitter.h> +#include <ntqgroupbox.h> +#include <ntqfile.h> +#include <ntqdir.h> +#include <ntqpixmap.h> /* Linux-specific includes */ #include <dirent.h> #include <unistd.h> @@ -76,7 +76,7 @@ using namespace tk; #define MAX_TN_RATE 60*20 #define MAX_CBWS_RATE 60 -torkView::torkView(QWidget *parent) +torkView::torkView(TQWidget *parent) : torkview_base(parent), m_pop(0L), m_tormon(TorkConfig::showTorMon()), torbtx(0), torbrx(0) { @@ -145,7 +145,7 @@ torkView::torkView(QWidget *parent) menuItems << allpurposeitem << konversationitem << pidginitem << gaimitem << operaitem << firefoxitem; menuItems << hiddenservicesitem << konqitem << mixminionitem; - for ( QValueList<HitWidget*>::Iterator it = menuItems.begin(); it != menuItems.end(); ++it ){ + for ( TQValueList<HitWidget*>::Iterator it = menuItems.begin(); it != menuItems.end(); ++it ){ if (*it) (*it)->setEnabled(false); } @@ -169,13 +169,13 @@ torkView::torkView(QWidget *parent) m_nontorosd->readSettings(KGlobal::config()); //Icons showing the status of the stream - streamStatusIcon["SUCCEEDED"] = QPixmap(SmallIcon("tork_green")); - streamStatusIcon["FAILED"] = QPixmap(SmallIcon("tork_red")); - streamStatusIcon["SENTCONNECT"] = QPixmap(SmallIcon("tork_yellow")); - streamStatusIcon["SENTRESOLVE"] = QPixmap(SmallIcon("tork_orange")); - streamStatusIcon["NEW"] = QPixmap(SmallIcon("tork_little")); - streamStatusIcon["DETACHED"] = QPixmap(SmallIcon("tork_little")); - streamStatusIcon["CLOSED"] = QPixmap(SmallIcon("tork_todelete")); + streamStatusIcon["SUCCEEDED"] = TQPixmap(SmallIcon("tork_green")); + streamStatusIcon["FAILED"] = TQPixmap(SmallIcon("tork_red")); + streamStatusIcon["SENTCONNECT"] = TQPixmap(SmallIcon("tork_yellow")); + streamStatusIcon["SENTRESOLVE"] = TQPixmap(SmallIcon("tork_orange")); + streamStatusIcon["NEW"] = TQPixmap(SmallIcon("tork_little")); + streamStatusIcon["DETACHED"] = TQPixmap(SmallIcon("tork_little")); + streamStatusIcon["CLOSED"] = TQPixmap(SmallIcon("tork_todelete")); progDisplayCounter = 0; } @@ -212,7 +212,7 @@ void torkView::updateChart() { void torkView::changeQuickConfigure(int no) { -/* QValueList<int> qconf; +/* TQValueList<int> qconf; qconf << 4 << 2 << 3 << 5 << 6 << 7;*/ TorkConfig::setQuickConfigure(no); } @@ -257,8 +257,8 @@ void torkView::sendAnonymousEmail() { if (TorkConfig::availablePrograms().contains("mixminion")){ - QString caption; - QString message; + TQString caption; + TQString message; caption = i18n("Mixminion Not Installed!"); message = i18n("<p>Mixminion does not appear to be installed on your system.<br>"); message += i18n("<p><b>Try installing it from the main interface.</b><br>"); @@ -275,12 +275,12 @@ bool torkView::checkInterface() { bool gotone = false; //Would anyone have this many ethernet cards? - QStringList devices; + TQStringList devices; devices << "eth" << "wlan"; - for ( QStringList::Iterator it = devices.begin(); it != devices.end(); ++it ){ + for ( TQStringList::Iterator it = devices.begin(); it != devices.end(); ++it ){ for (int i=0; i < 5; i++){ - QString devpath = QString("/sys/class/net/%1%2").arg((*it)).arg(i); - QDir ethdir(devpath); + TQString devpath = TQString("/sys/class/net/%1%2").arg((*it)).arg(i); + TQDir ethdir(devpath); if (ethdir.exists()){ mSysDevPathList.append(devpath); gotone = true; @@ -292,11 +292,11 @@ bool torkView::checkInterface() { return gotone; } -void torkView::torify(const QString& text) +void torkView::torify(const TQString& text) { - QString command = "usewithtor " + text; - QString icon = text.section(" ",0,0); + TQString command = "usewithtor " + text; + TQString icon = text.section(" ",0,0); KRun::runCommand( command, icon, icon ); } @@ -306,25 +306,25 @@ void torkView::anonymousFirefox() anonymizedFirefox("http://healthcheck.anonymityanywhere.com/"); } -void torkView::anonymizedFirefox(const QString& url) +void torkView::anonymizedFirefox(const TQString& url) { - QString text = "firefox"; - QString firefoxdir = QString("%1/.mozilla/firefox").arg(getenv("HOME")); + TQString text = "firefox"; + TQString firefoxdir = TQString("%1/.mozilla/firefox").arg(getenv("HOME")); - QString torkfirefox = QString("%1/tork.TorkAnonymous").arg(firefoxdir); - QDir torkdir(torkfirefox); + TQString torkfirefox = TQString("%1/tork.TorkAnonymous").arg(firefoxdir); + TQDir torkdir(torkfirefox); if (!torkdir.exists()){ - QFile inf(QString("%1/profiles.ini").arg(firefoxdir)); - QString line; + TQFile inf(TQString("%1/profiles.ini").arg(firefoxdir)); + TQString line; int profileno=0; if ( inf.open(IO_ReadOnly) ) { - QTextStream stream( &inf ); + TQTextStream stream( &inf ); while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' if (line.contains("[Profile")){ - QRegExp rx("([0-9]{1,4})"); + TQRegExp rx("([0-9]{1,4})"); rx.search(line); profileno = rx.cap(0).toInt() + 1; } @@ -334,13 +334,13 @@ void torkView::anonymizedFirefox(const QString& url) inf.close(); }else{ emit processWarning("cantreadprofiles",i18n("Can't read %1") - .arg(QString("%1/profiles.ini").arg(firefoxdir))); + .arg(TQString("%1/profiles.ini").arg(firefoxdir))); KIO::NetAccess::del(torkfirefox,0L); return; } - QString originalprofile = line.replace("Path=",""); - QString originalfirefox = QString("%1/%2").arg(firefoxdir).arg(originalprofile); + TQString originalprofile = line.replace("Path=",""); + TQString originalfirefox = TQString("%1/%2").arg(firefoxdir).arg(originalprofile); if (!KIO::NetAccess::dircopy(originalfirefox,torkfirefox, 0L)) { @@ -351,10 +351,10 @@ void torkView::anonymizedFirefox(const QString& url) //Update Profile - QFile inf2(QString("%1/profiles.ini").arg(firefoxdir)); + TQFile inf2(TQString("%1/profiles.ini").arg(firefoxdir)); if ( inf2.open(IO_WriteOnly | IO_Append) ) { - QTextStream ts( &inf2 ); + TQTextStream ts( &inf2 ); ts << "\n"; ts << "[Profile" << profileno << "]" << "\n"; ts << "Name=TorkAnonymous" << "\n"; @@ -364,7 +364,7 @@ void torkView::anonymizedFirefox(const QString& url) inf2.close(); }else{ emit processWarning("cantreadprofiles",i18n("Can't read %1") - .arg(QString("%1/profiles.ini").arg(firefoxdir))); + .arg(TQString("%1/profiles.ini").arg(firefoxdir))); KIO::NetAccess::del(torkfirefox,0L); return; } @@ -372,10 +372,10 @@ void torkView::anonymizedFirefox(const QString& url) } //Update Profile - QFile inf3(QString("%1/prefs.js").arg(torkfirefox)); + TQFile inf3(TQString("%1/prefs.js").arg(torkfirefox)); if ( inf3.open(IO_WriteOnly | IO_Append) ) { - QTextStream ts( &inf3 ); + TQTextStream ts( &inf3 ); ts << "user_pref(\"network.proxy.ftp\", \"\");" << "\n"; ts << "user_pref(\"network.proxy.ftp_port\", 0);" << "\n"; @@ -438,12 +438,12 @@ void torkView::anonymizedFirefox(const QString& url) inf3.close(); }else{ - emit processWarning("cantwritefirefoxsettings", i18n("Can't write to %1").arg(QString("%1/prefs.js").arg(torkfirefox))); + emit processWarning("cantwritefirefoxsettings", i18n("Can't write to %1").arg(TQString("%1/prefs.js").arg(torkfirefox))); KIO::NetAccess::del(torkfirefox,0L); return; } - KRun::runCommand( QString("%1 -P TorkAnonymous %2").arg(text).arg(url), text, text ); + KRun::runCommand( TQString("%1 -P TorkAnonymous %2").arg(text).arg(url), text, text ); } @@ -453,20 +453,20 @@ void torkView::anonymousOpera() anonymizedOpera("http://healthcheck.anonymityanywhere.com/"); } -void torkView::anonymizedOpera(const QString& url) +void torkView::anonymizedOpera(const TQString& url) { - QString text = "opera"; - QString originalopera = QString("%1/.opera").arg(getenv("HOME")); - QString torkopera = QString("%1/.opera-tork").arg(getenv("HOME")); - QDir torkdir(torkopera); + TQString text = "opera"; + TQString originalopera = TQString("%1/.opera").arg(getenv("HOME")); + TQString torkopera = TQString("%1/.opera-tork").arg(getenv("HOME")); + TQDir torkdir(torkopera); if (!torkdir.exists()) KIO::NetAccess::dircopy(originalopera,torkopera,0L); - QFile inf(QString("%1/.opera-tork/opera6.ini").arg(getenv("HOME"))); + TQFile inf(TQString("%1/.opera-tork/opera6.ini").arg(getenv("HOME"))); if ( inf.open(IO_WriteOnly | IO_Append) ) { - QTextStream ts( &inf ); + TQTextStream ts( &inf ); ts << "[Proxy]" << "\n"; ts << "HTTPS server=" << TorkConfig::konqHttpsProxy() << ":" << TorkConfig::konqHttpsProxyPort() << "\n"; @@ -485,7 +485,7 @@ void torkView::anonymizedOpera(const QString& url) ts << "Enable Cookies=0" << "\n"; inf.close(); - KRun::runCommand( QString("%1 -personaldir %2 -newpage %3").arg(text).arg(torkopera).arg(url), text, text ); + KRun::runCommand( TQString("%1 -personaldir %2 -newpage %3").arg(text).arg(torkopera).arg(url), text, text ); } @@ -495,24 +495,24 @@ void torkView::anonymizedOpera(const QString& url) void torkView::privoxiedBash() { - QString location = getenv("HOME"); + TQString location = getenv("HOME"); location += "/.tork"; - QDir torkdir(location); + TQDir torkdir(location); if (!torkdir.exists() && !torkdir.mkdir(location)) location = getenv("HOME"); - QFile inf(QString("%1/privoxy_konsole_session").arg(location)); + TQFile inf(TQString("%1/privoxy_konsole_session").arg(location)); if (! inf.open(IO_WriteOnly) ) { inf.close(); KMessageBox::information (this,"Couldn't create bash session file!"); return ; } - QTextStream ts( &inf ); -/* QTextStream &ts = *(inf.textStream());*/ + TQTextStream ts( &inf ); +/* TQTextStream &ts = *(inf.textStream());*/ - ts << QString("http_proxy=%1:%2").arg(TorkConfig::konqHttpProxy()).arg(TorkConfig::konqHttpProxyPort()) << "\n"; - ts << QString("https_proxy=%1:%2").arg(TorkConfig::konqHttpsProxy()).arg(TorkConfig::konqHttpsProxyPort()) << "\n"; + ts << TQString("http_proxy=%1:%2").arg(TorkConfig::konqHttpProxy()).arg(TorkConfig::konqHttpProxyPort()) << "\n"; + ts << TQString("https_proxy=%1:%2").arg(TorkConfig::konqHttpsProxy()).arg(TorkConfig::konqHttpsProxyPort()) << "\n"; ts << "HTTP_PROXY=$http_proxy" << "\n"; ts << "HTTPS_PROXY=$https_proxy" << "\n"; ts << "export HTTP_PROXY HTTP_PROXY http_proxy https_proxy" << "\n"; @@ -522,7 +522,7 @@ void torkView::privoxiedBash() inf.close(); - KRun::runCommand( QString("konsole --caption 'Shell Using Privoxy for Http requests - Launched From TorK' --noclose -e bash --init-file %1").arg(inf.name()), "konsole", "konsole" ); + KRun::runCommand( TQString("konsole --caption 'Shell Using Privoxy for Http requests - Launched From TorK' --noclose -e bash --init-file %1").arg(inf.name()), "konsole", "konsole" ); } @@ -576,7 +576,7 @@ void torkView::toggleAnonymizerTork(bool state) setHiddenServicesText(); welcomeitem->score->setEnabled(false); - for ( QValueList<HitWidget*>::Iterator it = menuItems.begin(); it != menuItems.end(); ++it ){ + for ( TQValueList<HitWidget*>::Iterator it = menuItems.begin(); it != menuItems.end(); ++it ){ if (*it) (*it)->setEnabled(true); } @@ -597,7 +597,7 @@ void torkView::toggleAnonymizerTork(bool state) welcomeitem->score->setEnabled(true); setHiddenServicesText(); - for ( QValueList<HitWidget*>::Iterator it = menuItems.begin(); it != menuItems.end(); ++it ){ + for ( TQValueList<HitWidget*>::Iterator it = menuItems.begin(); it != menuItems.end(); ++it ){ if (*it) (*it)->setEnabled(false); } @@ -609,9 +609,9 @@ void torkView::toggleAnonymizerTork(bool state) void torkView::setHiddenServicesText() { - QString activeHiddenServices; - QStringList hiddenServices = TorkConfig::hiddenServices(); - for ( QStringList::Iterator it = hiddenServices.begin(); it != hiddenServices.end(); ++it ) + TQString activeHiddenServices; + TQStringList hiddenServices = TorkConfig::hiddenServices(); + for ( TQStringList::Iterator it = hiddenServices.begin(); it != hiddenServices.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -642,16 +642,16 @@ torkView::~torkView() #define MAXPROGDISPLAY 5 -void torkView::streamStatusUpdated(const QString &streamID, const QString &status, - const QString &circID, const QString &Target, const QString &info) +void torkView::streamStatusUpdated(const TQString &streamID, const TQString &status, + const TQString &circID, const TQString &Target, const TQString &info) { - QString tmpstatus = status.stripWhiteSpace(); + TQString tmpstatus = status.stripWhiteSpace(); streamItem* streamline; - QListViewItem* osdstreamline; - QListViewItem* torTrafficLine; + TQListViewItem* osdstreamline; + TQListViewItem* torTrafficLine; torTrafficLine=0L; @@ -661,46 +661,46 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu m_osd->infoList->adjustColumn(1); infoList->adjustColumn(2); - timeLastTorUse = QTime::currentTime(); + timeLastTorUse = TQTime::currentTime(); - QString cleanedFullTarget = Target; - cleanedFullTarget.replace(QRegExp("(\\.\\$[A-Z0-9]{40})\\."),"."); - QString cleanedTarget = cleanedFullTarget.section(":",0,0); - QString cleanedPort = cleanedFullTarget.section(":",1,1); + TQString cleanedFullTarget = Target; + cleanedFullTarget.replace(TQRegExp("(\\.\\$[A-Z0-9]{40})\\."),"."); + TQString cleanedTarget = cleanedFullTarget.section(":",0,0); + TQString cleanedPort = cleanedFullTarget.section(":",1,1); addrLastTorUse = cleanedFullTarget; if (TorkConfig::paranoidMode() > 0) emit newIdentity(); // Find the program associated with the stream - QString program = ".."; - QPixmap programicon; + TQString program = ".."; + TQPixmap programicon; if ((tmpstatus == "NEW")){ if (info.contains("PURPOSE=USER")){ - QRegExp rx("(SOURCE_ADDR=127.0.0.1:[0-9]+ )"); + TQRegExp rx("(SOURCE_ADDR=127.0.0.1:[0-9]+ )"); rx.search(info); - QString port = rx.cap(0).section("SOURCE_ADDR=127.0.0.1:",-1) + TQString port = rx.cap(0).section("SOURCE_ADDR=127.0.0.1:",-1) .stripWhiteSpace(); portStream[streamID] = port; }else{ - QString purpose = info.section("PURPOSE=",-1,-1); + TQString purpose = info.section("PURPOSE=",-1,-1); program = streamPurpose[purpose]; - programicon = QPixmap(SmallIcon("tork_tor")); + programicon = TQPixmap(SmallIcon("tork_tor")); } } // Assign the circuit and exit server to the stream circuitItem* circuitline; - QString circuit = "Pending.."; - QString exitserver; - QPixmap exitserverflag; + TQString circuit = "Pending.."; + TQString exitserver; + TQPixmap exitserverflag; // Don't look for circuit if one hasn't been assigned yet if (circID != "0") { if ((circuitline = (circuitItem*) circuitList->findItem(circID,0)) != 0){ - QListViewItem* serverline; - if ((serverline = (QListViewItem*) circuitExits[circID]) != 0){ + TQListViewItem* serverline; + if ((serverline = (TQListViewItem*) circuitExits[circID]) != 0){ exitserver = serverline->text(1); exitserverflag = *serverline->pixmap(1); } @@ -709,10 +709,10 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu } //Assign an icon to illustrate the type of stream - QPixmap icon = cachedStreamIcon[cleanedFullTarget]; + TQPixmap icon = cachedStreamIcon[cleanedFullTarget]; if (icon.isNull()){ - QString iconPath = locate("cache", + TQString iconPath = locate("cache", KMimeType::favIconForURL("http://"+cleanedTarget) +".png"); @@ -720,7 +720,7 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu icon.load( iconPath ); if (cleanedPort == "443"){ - QPixmap overlay = KSystemTray::loadIcon( "tork_ssl" ); + TQPixmap overlay = KSystemTray::loadIcon( "tork_ssl" ); if ( !overlay.isNull() ) { @@ -728,10 +728,10 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu int y = icon.height() - overlay.height(); if ( icon.mask() ) { - QBitmap mask = *icon.mask(); + TQBitmap mask = *icon.mask(); bitBlt( &mask, x, y, overlay.mask() ? - const_cast<QBitmap*>(overlay.mask()) : &overlay, + const_cast<TQBitmap*>(overlay.mask()) : &overlay, 0, 0, overlay.width(), overlay.height(), overlay.mask() ? OrROP : SetROP ); icon.setMask(mask); @@ -760,15 +760,15 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu } //Assign an icon to illustrate the stream status - QPixmap statusicon = streamStatusIcon[tmpstatus]; + TQPixmap statusicon = streamStatusIcon[tmpstatus]; //Display the entries in the UI //Add to the traffic log if necessary if (TorkConfig::logTorTraffic()){ - torTrafficLine = new QListViewItem(TorTraffic, streamID, - QDateTime::currentDateTime(). - toString(Qt::ISODate). + torTrafficLine = new TQListViewItem(TorTraffic, streamID, + TQDateTime::currentDateTime(). + toString(TQt::ISODate). replace("T"," "), cleanedFullTarget, circuit); @@ -788,7 +788,7 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu streamline->setDropEnabled(true); //The stream in the OSD display - osdstreamline = new QListViewItem(m_osd->infoList,streamID, + osdstreamline = new TQListViewItem(m_osd->infoList,streamID, cleanedTarget,"","0 B/s", circuit); osdstreamline->setPixmap(2,statusicon); osdstreamline->setPixmap(1,icon); @@ -821,7 +821,7 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu return; } - QPixmap statusicon = streamStatusIcon[status.stripWhiteSpace()]; + TQPixmap statusicon = streamStatusIcon[status.stripWhiteSpace()]; streamline->setPixmap(3,statusicon); osdstreamline->setPixmap(2,statusicon); @@ -829,16 +829,16 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu // If the stream does not have a verbose circuit description, add one if ((streamline->text(6) == "Pending..")){ - QString circuit = "Pending.."; - QString exitserver; - QPixmap exitserverflag; + TQString circuit = "Pending.."; + TQString exitserver; + TQPixmap exitserverflag; circuitItem* circuitline; // Don't look for circuit if one hasn't been assigned yet if (circID != "0") { if ((circuitline = (circuitItem*) circuitList->findItem(circID,0)) != 0){ - QListViewItem* serverline; - if ((serverline = (QListViewItem*) circuitExits[circID]) != 0){ + TQListViewItem* serverline; + if ((serverline = (TQListViewItem*) circuitExits[circID]) != 0){ exitserver = serverline->text(1); exitserverflag = *serverline->pixmap(1); } @@ -868,8 +868,8 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu if (streamline->text(1) == ".."){ if ((streamList->childCount() < (MAXPROGDISPLAY * 3)) && (progDisplayCounter < MAXPROGDISPLAY)) { - QString program = parseStreamPort(portStream[streamID]); - QPixmap programicon = streamProgram(program); + TQString program = parseStreamPort(portStream[streamID]); + TQPixmap programicon = streamProgram(program); streamline->setText(1,program); streamline->setPixmap(1,programicon); progDisplayCounter++; @@ -881,7 +881,7 @@ void torkView::streamStatusUpdated(const QString &streamID, const QString &statu } -QString torkView::parseStreamPort(const QString &str_port) +TQString torkView::parseStreamPort(const TQString &str_port) { int m_port = str_port.toInt(); @@ -894,19 +894,19 @@ QString torkView::parseStreamPort(const QString &str_port) struct dirent *pde; DIR *pdir; - QString line; - QString inode; + TQString line; + TQString inode; bool foundIt = false; - QFile tcp("/proc/net/tcp") ; + TQFile tcp("/proc/net/tcp") ; tcp.open (IO_ReadOnly) ; - QTextStream input(&tcp) ; + TQTextStream input(&tcp) ; while (!input.eof()) { - QString line = input.readLine() ; - QStringList bits = QStringList::split (QRegExp("[ :]+"), line) ; + TQString line = input.readLine() ; + TQStringList bits = TQStringList::split (TQRegExp("[ :]+"), line) ; int port = bits[2].toLong(0, 16) ; if (port == m_port) @@ -917,19 +917,19 @@ QString torkView::parseStreamPort(const QString &str_port) } if (inode.isEmpty()) - return QString(); + return TQString(); - QDir d = QDir( "/proc" ); - QStringList dirs = d.entryList( QDir::Dirs ); - QStringList::Iterator it; + TQDir d = TQDir( "/proc" ); + TQStringList dirs = d.entryList( TQDir::Dirs ); + TQStringList::Iterator it; for ( it = dirs.begin(); it != dirs.end(); ++it ) { - QDir fd = QDir( "/proc/" +*it+"/fd" ); + TQDir fd = TQDir( "/proc/" +*it+"/fd" ); if (!fd.exists()) continue; - QString path = "/proc/" +*it+"/fd"; + TQString path = "/proc/" +*it+"/fd"; if ((pdir = opendir((const char*)path)) == NULL) continue; @@ -945,14 +945,14 @@ QString torkView::parseStreamPort(const QString &str_port) lbuf[len] = '\0'; - if (QString(lbuf).contains(inode)){ + if (TQString(lbuf).contains(inode)){ foundIt = true; - QFile file( "/proc/"+*it+"/cmdline" ); + TQFile file( "/proc/"+*it+"/cmdline" ); file.open( IO_ReadOnly ); if ( !file.isOpen() ) continue; - QTextStream t( &file ); - QString program = t.readLine(); + TQTextStream t( &file ); + TQString program = t.readLine(); program.replace('\0',' '); program = program.section(" ",0,0).section("/",-1); return program; @@ -963,13 +963,13 @@ QString torkView::parseStreamPort(const QString &str_port) if (foundIt) break; } - return QString(); + return TQString(); } -void torkView::circuitStatusUpdated(const QString &circuitID, const QString &status, const QString &server, const QString &exit) +void torkView::circuitStatusUpdated(const TQString &circuitID, const TQString &status, const TQString &server, const TQString &exit) { - QString tmpstatus = status.lower().stripWhiteSpace(); + TQString tmpstatus = status.lower().stripWhiteSpace(); circuitItem* circuitline; if ((circuitline = (circuitItem*)circuitList->findItem(circuitID,0)) == 0){ @@ -982,7 +982,7 @@ void torkView::circuitStatusUpdated(const QString &circuitID, const QString &sta for( uint index = 0; index < circuitIconList.count(); index++ ) { if ( circuitIconList[index].contains(tmpstatus)) { - circuitline->setPixmap(1,QPixmap(SmallIcon("tork_"+circuitIconList[index].first()))); + circuitline->setPixmap(1,TQPixmap(SmallIcon("tork_"+circuitIconList[index].first()))); continue; } } @@ -991,23 +991,23 @@ void torkView::circuitStatusUpdated(const QString &circuitID, const QString &sta delete circuitline; circuitExits.erase(circuitID); }else if (!exit.isEmpty()){ - QListViewItem* serverline; - if ((serverline = (QListViewItem*) serverList->findItem(exit,2)) != 0){ + TQListViewItem* serverline; + if ((serverline = (TQListViewItem*) serverList->findItem(exit,2)) != 0){ circuitExits[circuitID] = serverline; } } } -void torkView::ORStatusUpdated(const QString &ORID, const QString &status) +void torkView::ORStatusUpdated(const TQString &ORID, const TQString &status) { - QString tmpstatus = status.lower().stripWhiteSpace(); + TQString tmpstatus = status.lower().stripWhiteSpace(); - QListViewItem* ORline = ORList->findItem(ORID,1); + TQListViewItem* ORline = ORList->findItem(ORID,1); if (ORline == 0) - ORline = new QListViewItem(ORList, "", ORID); + ORline = new TQListViewItem(ORList, "", ORID); if (tmpstatus.contains("closed") || tmpstatus.contains("failed")){ delete ORline; @@ -1023,34 +1023,34 @@ void torkView::ORStatusUpdated(const QString &ORID, const QString &status) for( uint index = 0; index < iconList.count(); index++ ) { if ( iconList[index].contains(tmpstatus)) { - ORline->setPixmap(0,QPixmap(SmallIcon("tork_"+iconList[index].first()))); + ORline->setPixmap(0,TQPixmap(SmallIcon("tork_"+iconList[index].first()))); return; } } } -void torkView::guardStatusUpdated(const QString &ORID, const QString &status) +void torkView::guardStatusUpdated(const TQString &ORID, const TQString &status) { entryGuards[ORID] = status; - QString tmpstatus = status.lower().stripWhiteSpace(); + TQString tmpstatus = status.lower().stripWhiteSpace(); - QListViewItem* ORline = ORList->findItem(ORID,1); + TQListViewItem* ORline = ORList->findItem(ORID,1); if (ORline == 0) - ORline = new QListViewItem(ORList, "", ORID); + ORline = new TQListViewItem(ORList, "", ORID); for( uint index = 0; index < iconList.count(); index++ ) { if ( guardIconList[index].contains(tmpstatus)) { - ORline->setPixmap(0,QPixmap(SmallIcon("tork_guard_"+guardIconList[index].first()))); + ORline->setPixmap(0,TQPixmap(SmallIcon("tork_guard_"+guardIconList[index].first()))); return; } } } -void torkView::infoUpdated(const QString &type, const QString &summary, const QString &) +void torkView::infoUpdated(const TQString &type, const TQString &summary, const TQString &) { static int id = 0; @@ -1059,12 +1059,12 @@ void torkView::infoUpdated(const QString &type, const QString &summary, const QS total++; } uint count = 1; - QString tmpid; + TQString tmpid; for( uint index = 0; index < summary.length(); index += 120) { id++; - tmpid = QString("00000000000%1").arg(id).right(10); - new QListViewItem(infoList, QDateTime::currentDateTime ().toString(Qt::ISODate).replace("T"," "), - tmpid, type, QString("(%1 of %2) %3").arg(count) + tmpid = TQString("00000000000%1").arg(id).right(10); + new TQListViewItem(infoList, TQDateTime::currentDateTime ().toString(TQt::ISODate).replace("T"," "), + tmpid, type, TQString("(%1 of %2) %3").arg(count) .arg(total) .arg(summary.mid(index,120))); count++; @@ -1072,7 +1072,7 @@ void torkView::infoUpdated(const QString &type, const QString &summary, const QS } -void torkView::bwUpdated(const QString &in, const QString &out) +void torkView::bwUpdated(const TQString &in, const TQString &out) { @@ -1112,11 +1112,11 @@ void torkView::bwUpdated(const QString &in, const QString &out) } -QPixmap torkView::streamProgram(const QString &program) +TQPixmap torkView::streamProgram(const TQString &program) { - QString prog = KGlobal::iconLoader()->iconPath(program, KIcon::Small, true); + TQString prog = KGlobal::iconLoader()->iconPath(program, KIcon::Small, true); if (prog.isEmpty()) return SmallIcon( "exec" ); else @@ -1124,7 +1124,7 @@ QPixmap torkView::streamProgram(const QString &program) } -void torkView::streamBwUpdated(const QString &stream, const QString &in, const QString &out) +void torkView::streamBwUpdated(const TQString &stream, const TQString &in, const TQString &out) { //Tor Tx/Rx @@ -1141,28 +1141,28 @@ void torkView::reportBW(int secs) //Calculate Streams Tx/Rx - for ( QMap<QString, streamItem*>::Iterator stream = streams.begin(); stream != streams.end(); ++stream ) + for ( TQMap<TQString, streamItem*>::Iterator stream = streams.begin(); stream != streams.end(); ++stream ) { if (stream.data()){ stream.data()->calcBWRate(streamBwIn[stream.key().latin1()], streamBwOut[stream.key().latin1()], secs); - QString sbw = + TQString sbw = BytesPerSecToString( stream.data()->mSpeedHistoryRx[stream.data()->mSpeedHistoryPtr] + stream.data()->mSpeedHistoryTx[stream.data()->mSpeedHistoryPtr],0); //Overlay here -// QPixmap icon = stream.data()->pixmap(3); -// QPixmap pm(*(stream.data()->pixmap(3))); -// QPainter p; +// TQPixmap icon = stream.data()->pixmap(3); +// TQPixmap pm(*(stream.data()->pixmap(3))); +// TQPainter p; // p.begin(&pm); // -// p.drawText(stream.data()->pixmap(3)->rect(),Qt::AlignCenter,sbw); +// p.drawText(stream.data()->pixmap(3)->rect(),TQt::AlignCenter,sbw); // p.end(); // stream.data()->setPixmap(3,pm); stream.data()->setText(4,sbw); - QListViewItem* osdstreamline = osdstreams[stream.data()->text(0)]; + TQListViewItem* osdstreamline = osdstreams[stream.data()->text(0)]; osdstreamline->setText(3,sbw); } } @@ -1170,7 +1170,7 @@ void torkView::reportBW(int secs) //Calculate System Tx/Rx unsigned int sysbrx = 0; unsigned int sysbtx = 0; - for ( QStringList::Iterator it = mSysDevPathList.begin(); it != mSysDevPathList.end(); ++it ) + for ( TQStringList::Iterator it = mSysDevPathList.begin(); it != mSysDevPathList.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -1262,14 +1262,14 @@ void torkView::reportBW(int secs) if (upperOut < 0) upperOut = 0; else if (upperOut > 100) upperOut = 100; - QString kbsrx = BytesPerSecToString(mSpeedHistoryRx[mSpeedHistoryPtr]); - QString kbstx = BytesPerSecToString(mSpeedHistoryTx[mSpeedHistoryPtr]); + TQString kbsrx = BytesPerSecToString(mSpeedHistoryRx[mSpeedHistoryPtr]); + TQString kbstx = BytesPerSecToString(mSpeedHistoryTx[mSpeedHistoryPtr]); m_osd->m_graphIn->addPercentReading(upperIn, false); m_osd->m_graphOut->addPercentReading(upperOut, false); - m_osd->m_graphIn->setLabel(QString("Dn: %1") + m_osd->m_graphIn->setLabel(TQString("Dn: %1") .arg(kbsrx)); - m_osd->m_graphOut->setLabel(QString("Up: %1") + m_osd->m_graphOut->setLabel(TQString("Up: %1") .arg(kbstx)); // Update Tray and StatusBar @@ -1279,9 +1279,9 @@ void torkView::reportBW(int secs) kbstx); } -unsigned long torkView::readInterfaceNumValue(QString interface, +unsigned long torkView::readInterfaceNumValue(TQString interface, const char* name) { - // stdio functions appear to be more fast than QFile? + // stdio functions appear to be more fast than TQFile? FILE* fp = fopen((interface+"/statistics/"+name).latin1(), "r"); if (!fp) return 0; @@ -1292,35 +1292,35 @@ unsigned long torkView::readInterfaceNumValue(QString interface, } -void torkView::activeServersUpdated( const QStringList &servers) +void torkView::activeServersUpdated( const TQStringList &servers) { - QListViewItem* tm; - QStringList tmpservers = servers; - for ( QStringList::Iterator it = tmpservers.begin(); it != tmpservers.end(); ++it ) + TQListViewItem* tm; + TQStringList tmpservers = servers; + for ( TQStringList::Iterator it = tmpservers.begin(); it != tmpservers.end(); ++it ) { if ((*it).isEmpty()) continue; if ( (tm = serverList->findItem((*it),1)) > 0){ - tm->setPixmap(0,QPixmap(SmallIcon("tork_green"))); + tm->setPixmap(0,TQPixmap(SmallIcon("tork_green"))); }else{ - tm = new QListViewItem(serverList, (*it)); - tm->setPixmap(0,QPixmap(SmallIcon("tork_green"))); + tm = new TQListViewItem(serverList, (*it)); + tm->setPixmap(0,TQPixmap(SmallIcon("tork_green"))); } } } -void torkView::serverStatusUpdated(const QString &ip,const QString &fp, - const QString &server, const QString &statuses) +void torkView::serverStatusUpdated(const TQString &ip,const TQString &fp, + const TQString &server, const TQString &statuses) { - QListViewItem* tm; + TQListViewItem* tm; if (!(tm = torservers[fp])){ - tm = new QListViewItem(serverList, "", (server), fp, statuses); + tm = new TQListViewItem(serverList, "", (server), fp, statuses); torservers[fp] = tm; } - QString cc; + TQString cc; int country_id = 0; GeoIP * gi = 0; if (geoip_db) @@ -1340,23 +1340,23 @@ void torkView::serverStatusUpdated(const QString &ip,const QString &fp, }else cc = "--"; - QString ccode = QString("%1").arg(country_id); + TQString ccode = TQString("%1").arg(country_id); tm->setText(4,ccode); tm->setText(5,ip); /* - QRegExp rx("^[0-9]{1,3}\\."); + TQRegExp rx("^[0-9]{1,3}\\."); rx.search(ip); - QString tmp = rx.cap(0); + TQString tmp = rx.cap(0); if (!m_subnet16List.contains(tmp)) m_subnet16List << tmp; */ if (cc == "--") - tm->setPixmap(1,QPixmap(SmallIcon("help"))); + tm->setPixmap(1,TQPixmap(SmallIcon("help"))); else - tm->setPixmap(1,QPixmap(SmallIcon("tork_" + cc.lower()))); + tm->setPixmap(1,TQPixmap(SmallIcon("tork_" + cc.lower()))); - QString icontouse; + TQString icontouse; if ((statuses.contains("Stable")) && (statuses.contains("Running")) && (statuses.contains("Fast"))) icontouse = "tork_green"; else if ((statuses.contains("Fast")) && (statuses.contains("Running"))) @@ -1375,30 +1375,30 @@ void torkView::serverStatusUpdated(const QString &ip,const QString &fp, // Update Exclude Nodes if Country is Excluded and this server is new to us if (TorkConfig::excludeCountries().contains(ccode)){ - if (!TorkConfig::excludeServersHistory().contains(QString("%1-%2-%3") + if (!TorkConfig::excludeServersHistory().contains(TQString("%1-%2-%3") .arg(ccode).arg(fp).arg(server))){ - QStringList existingServers = TorkConfig::excludeServersHistory(); - existingServers.append(QString("%1-%2-%3").arg(ccode).arg(fp).arg(server)); + TQStringList existingServers = TorkConfig::excludeServersHistory(); + existingServers.append(TQString("%1-%2-%3").arg(ccode).arg(fp).arg(server)); TorkConfig::setExcludeServersHistory(existingServers); - QStringList permList; + TQStringList permList; permList = TorkConfig::excludeNodes(); - QString node = "$"+getFPFromFPDigest(fp); + TQString node = "$"+getFPFromFPDigest(fp); permList.append(node); } } - tm->setPixmap(0,QPixmap(SmallIcon(icontouse))); + tm->setPixmap(0,TQPixmap(SmallIcon(icontouse))); } void torkView::switchColors() { // switch the foreground/background colors of the label -/* QColor color = Settings::col_background(); +/* TQColor color = Settings::col_background(); Settings::setCol_background( Settings::col_foreground() ); Settings::setCol_foreground( color ); */ @@ -1415,19 +1415,19 @@ void torkView::settingsChanged() emit signalChangeStatusbar( i18n("Settings changed") );*/ } -void torkView::displayError( const QString &caption, const QString &infol) +void torkView::displayError( const TQString &caption, const TQString &infol) { if (!circuitList->recentDropEvent()) return; - QString info = infol;; - info.replace(QRegExp("(\\$[A-Z0-9]{40})(~|=)"),""); + TQString info = infol;; + info.replace(TQRegExp("(\\$[A-Z0-9]{40})(~|=)"),""); delete m_pop; KPassivePopup* pop; - QPoint pnt; + TQPoint pnt; if (kmain->isActiveWindow()){ pop = new KPassivePopup( kmain ); pnt = kmain->pos() += kmain->m_view->pos() += kmain->m_view->circuitList->pos() += @@ -1438,18 +1438,18 @@ void torkView::displayError( const QString &caption, const QString &infol) pnt = kmain->_tray->pos(); } pop->setView( caption,info ); - pop->show(QPoint(pnt)); + pop->show(TQPoint(pnt)); m_pop = pop; } -void torkView::displayServer( const QString &caption, const QString &info) +void torkView::displayServer( const TQString &caption, const TQString &info) { KPassivePopup* pop; - QPoint pnt; + TQPoint pnt; if (kmain->isActiveWindow()){ pop = new KPassivePopup( serverList ); //pnt = kmain->pos() -= kmain->m_view->serverList->getMousePos() -= kmain->m_view->serverList->getMousePos() -= kmain->m_view->serverList->getMousePos(); @@ -1458,22 +1458,22 @@ void torkView::displayServer( const QString &caption, const QString &info) pnt = kmain->_tray->pos(); } pop->setView( caption,info ); - //pop->show(QPoint(pnt)); + //pop->show(TQPoint(pnt)); pop->show(); } -void torkView::showServerBW(const QString &fp ) +void torkView::showServerBW(const TQString &fp ) { - QString fl; - QString tmpFile; - fl = QString("http://www.noreply.org/tor-running-routers/%1/node-traf-%2.png") + TQString fl; + TQString tmpFile; + fl = TQString("http://www.noreply.org/tor-running-routers/%1/node-traf-%2.png") .arg(fp.left(2)).arg(fp); KIO::NetAccess::download( fl, tmpFile, 0L ); kapp->processEvents(); - streamList-> setPaletteBackgroundPixmap( QPixmap(tmpFile) ); + streamList-> setPaletteBackgroundPixmap( TQPixmap(tmpFile) ); } @@ -1487,11 +1487,11 @@ void torkView::hidePopup( ) void torkView::populateMenu() { Anonymizer->clear(); - QFont font; + TQFont font; //Welcome - welcomeitem = new HitWidget(QString::null, QString::null); - welcomeheaderLabel = new QLabel(welcomeitem); + welcomeitem = new HitWidget(TQString::null, TQString::null); + welcomeheaderLabel = new TQLabel(welcomeitem); welcomeheaderLabel->setText(i18n("Press 'Play' to get started!")); font.setBold( true ); welcomeheaderLabel->setFont( font ); @@ -1529,11 +1529,11 @@ void torkView::populateMenu() paranoidmodeicon->setPixmap(SmallIcon("tork_penguin")); paranoidmodetext->setText(i18n("In Normal mode!")); - QStringList qconf; + TQStringList qconf; qconf << "Clnt/Exit" << "Clnt/Relay" << "Exit" << "Relay" << "Client" << "Custom" << "Remote" << "Local"; welcomeitem->score->setHidden(false); welcomeitem->score->insertStringList(qconf); - welcomeitem->score->setPalette(QPalette(Qt::white,Qt::white)); + welcomeitem->score->setPalette(TQPalette(TQt::white,TQt::white)); welcomeitem->score->setCurrentItem(TorkConfig::quickConfigure()); @@ -1543,16 +1543,16 @@ void torkView::populateMenu() connect(welcomeitem->icon, SIGNAL(leftClickedURL()), SIGNAL(startEverything())); - QLabel *headerLabel; + TQLabel *headerLabel; //Firefox firefoxitem = 0L; #ifndef LIVECD if (TorkConfig::availablePrograms().contains("firefox")){ - firefoxitem = new HitWidget(QString::null, QString::null); + firefoxitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(firefoxitem); + headerLabel = new TQLabel(firefoxitem); headerLabel->setText(i18n("Anonymous Browsing (with Firefox)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1568,7 +1568,7 @@ void torkView::populateMenu() )+"</qt>"); firefoxitem->icon->setURL("firefox"); - //QComboBox* countries = new QComboBox( FALSE, "this" ); + //TQComboBox* countries = new TQComboBox( FALSE, "this" ); //firefoxitem->insertWidget(1,countries); buttonStart = new KURLLabel(firefoxitem); @@ -1588,8 +1588,8 @@ void torkView::populateMenu() #endif //Anonymous Mail - mixminionitem = new HitWidget(QString::null, QString::null); - headerLabel = new QLabel(mixminionitem); + mixminionitem = new HitWidget(TQString::null, TQString::null); + headerLabel = new TQLabel(mixminionitem); headerLabel->setText(i18n("Anonymous Email")); font.setBold( true ); headerLabel->setFont( font ); @@ -1606,15 +1606,15 @@ void torkView::populateMenu() )+"</qt>"); -// QStringList qconf; +// TQStringList qconf; // qconf << "Simple" << "KMail"; // -// QFont f( sshitem->score->font().rawName(), +// TQFont f( sshitem->score->font().rawName(), // sshitem->score->font().pointSize() - 1 ); // mixminionitem->score->setFont( f ); // mixminionitem->score->setHidden(false); // mixminionitem->score->insertStringList(shellsAvailable); -// mixminionitem->score->setPalette(QPalette(Qt::white,Qt::white)); +// mixminionitem->score->setPalette(TQPalette(TQt::white,TQt::white)); // connect(mixminionitem->score, SIGNAL(activated(int)),mixminionitem, // SLOT(changeTerminalUrl(int))); @@ -1646,8 +1646,8 @@ void torkView::populateMenu() //Konqueror #ifndef LIVECD if (TorkConfig::availablePrograms().contains("konqueror")){ - konqitem = new HitWidget(QString::null, QString::null); - headerLabel = new QLabel(konqitem); + konqitem = new HitWidget(TQString::null, TQString::null); + headerLabel = new TQLabel(konqitem); headerLabel->setText(i18n("Anonymous Browsing (with Konqueror)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1656,7 +1656,7 @@ void torkView::populateMenu() konqitem->setIcon("tork_konqueror_play"); if (TorkConfig::kDEUsesTor()) - konqitem->icon->pixmap()->fill(Qt::red); + konqitem->icon->pixmap()->fill(TQt::red); konqitem->setDescriptionText("<qt>"+i18n("<b>Click the icon to launch an anonymous browsing session. </b><br>" )+"</qt>"); @@ -1701,8 +1701,8 @@ void torkView::populateMenu() if (TorkConfig::availablePrograms().contains("opera")){ - operaitem = new HitWidget(QString::null, QString::null); - headerLabel = new QLabel(operaitem); + operaitem = new HitWidget(TQString::null, TQString::null); + headerLabel = new TQLabel(operaitem); headerLabel->setText(i18n("Anonymous Browsing (with Opera)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1718,16 +1718,16 @@ void torkView::populateMenu() )+"</qt>"); operaitem->icon->setURL("opera"); Anonymizer->insertItem(operaitem); - connect(operaitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(anonymizedOpera(const QString&))); + connect(operaitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(anonymizedOpera(const TQString&))); } #endif hiddenservicesitem = 0L; //Hidden Services - hiddenservicesitem = new HitWidget(QString::null, QString::null); + hiddenservicesitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(hiddenservicesitem); + headerLabel = new TQLabel(hiddenservicesitem); headerLabel->setText(i18n("Anonymous Websites and Web Services")); font.setBold( true ); headerLabel->setFont( font ); @@ -1759,9 +1759,9 @@ void torkView::populateMenu() #ifndef LIVECD if (TorkConfig::availablePrograms().contains("kopete")){ - kopeteitem = new HitWidget(QString::null, QString::null); + kopeteitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(kopeteitem); + headerLabel = new TQLabel(kopeteitem); headerLabel->setText(i18n("Anonymous Instant Messaging/IRC (with Kopete)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1775,7 +1775,7 @@ void torkView::populateMenu() )+"</qt>"); kopeteitem->icon->setURL("kopete --caption 'Anonymous IM Session - Launched From TorK'"); Anonymizer->insertItem(kopeteitem); - connect(kopeteitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(kopeteitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //Gaim @@ -1784,8 +1784,8 @@ void torkView::populateMenu() #ifndef LIVECD if (TorkConfig::availablePrograms().contains("gaim")){ - gaimitem = new HitWidget(QString::null, QString::null); - headerLabel = new QLabel(gaimitem); + gaimitem = new HitWidget(TQString::null, TQString::null); + headerLabel = new TQLabel(gaimitem); headerLabel->setText(i18n("Anonymous Instant Messaging/IRC (with Gaim)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1799,7 +1799,7 @@ void torkView::populateMenu() )+"</qt>"); gaimitem->icon->setURL("gaim"); Anonymizer->insertItem(gaimitem); - connect(gaimitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(gaimitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //Pidgin @@ -1809,8 +1809,8 @@ void torkView::populateMenu() #ifndef LIVECD if (TorkConfig::availablePrograms().contains("pidgin")){ - pidginitem = new HitWidget(QString::null, QString::null); - headerLabel = new QLabel(pidginitem); + pidginitem = new HitWidget(TQString::null, TQString::null); + headerLabel = new TQLabel(pidginitem); headerLabel->setText(i18n("Anonymous Instant Messaging/IRC (with Pidgin)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1824,7 +1824,7 @@ void torkView::populateMenu() )+"</qt>"); pidginitem->icon->setURL("pidgin"); Anonymizer->insertItem(pidginitem); - connect(pidginitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(pidginitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //Gaim @@ -1834,9 +1834,9 @@ void torkView::populateMenu() if (TorkConfig::availablePrograms().contains("konversation")){ - konversationitem = new HitWidget(QString::null, QString::null); + konversationitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(konversationitem); + headerLabel = new TQLabel(konversationitem); headerLabel->setText(i18n("Anonymous Instant Messaging/IRC (with Konversation)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1850,7 +1850,7 @@ void torkView::populateMenu() )+"</qt>"); konversationitem->icon->setURL("konversation"); Anonymizer->insertItem(konversationitem); - connect(konversationitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(konversationitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //KSIRC @@ -1859,9 +1859,9 @@ void torkView::populateMenu() #ifndef LIVECD if (TorkConfig::availablePrograms().contains("ksirc")){ - ksircitem = new HitWidget(QString::null, QString::null); + ksircitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(ksircitem); + headerLabel = new TQLabel(ksircitem); headerLabel->setText(i18n("Anonymous IRC (with KSirc)")); font.setBold( true ); headerLabel->setFont( font ); @@ -1876,23 +1876,23 @@ void torkView::populateMenu() ksircitem->icon->setURL("ksirc --caption 'Anonymous IRC Shell - Launched From TorK'"); Anonymizer->insertItem(ksircitem); - connect(ksircitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(ksircitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //SSH - QStringList shellCandidates; - QStringList shellsAvailable; + TQStringList shellCandidates; + TQStringList shellsAvailable; shellCandidates << "konsole" << "yakuake" << "xterm" << "rxvt" << "gnome-terminal"; - for ( QStringList::Iterator it = shellCandidates.begin(); it != shellCandidates.end(); it++ ) + for ( TQStringList::Iterator it = shellCandidates.begin(); it != shellCandidates.end(); it++ ) { if (TorkConfig::availablePrograms().contains(*it)) shellsAvailable << (*it); } - QStringList hkpShellsAvailable = shellsAvailable; + TQStringList hkpShellsAvailable = shellsAvailable; if (TorkConfig::availablePrograms().contains("x3270")) shellsAvailable << "x3270"; @@ -1902,9 +1902,9 @@ void torkView::populateMenu() #ifndef LIVECD if (!shellsAvailable.isEmpty()){ - sshitem = new HitWidget(QString::null, QString::null); + sshitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(sshitem); + headerLabel = new TQLabel(sshitem); headerLabel->setText(i18n("Anonymous SSH Session")); font.setBold( true ); headerLabel->setFont( font ); @@ -1937,15 +1937,15 @@ void torkView::populateMenu() sshitem->shellTitles["rxvt"] = " -title 'Anonymous SSH Shell - Launched From TorK'"; sshitem->shellTitles["gnome-terminal"] = " --title 'Anonymous SSH Shell - Launched From TorK'"; - QFont f( sshitem->score->font().rawName(), sshitem->score->font().pointSize() - 1 ); + TQFont f( sshitem->score->font().rawName(), sshitem->score->font().pointSize() - 1 ); sshitem->score->setFont( f ); sshitem->score->setHidden(false); sshitem->score->insertStringList(shellsAvailable); - sshitem->score->setPalette(QPalette(Qt::white,Qt::white)); + sshitem->score->setPalette(TQPalette(TQt::white,TQt::white)); connect(sshitem->score, SIGNAL(activated(int)),sshitem, SLOT(changeTerminalUrl(int))); Anonymizer->insertItem(sshitem); - connect(sshitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(sshitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //Telnet @@ -1954,9 +1954,9 @@ void torkView::populateMenu() #ifndef LIVECD if (!shellsAvailable.isEmpty()){ - telnetitem = new HitWidget(QString::null, QString::null); + telnetitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(telnetitem); + headerLabel = new TQLabel(telnetitem); headerLabel->setText(i18n("Anonymous Telnet Session")); font.setBold( true ); headerLabel->setFont( font ); @@ -1987,15 +1987,15 @@ void torkView::populateMenu() telnetitem->shellTitles["rxvt"] = " -title 'Anonymous Telnet Session - Launched From TorK'"; telnetitem->shellTitles["gnome-terminal"] = " --title 'Anonymous Telnet Session - Launched From TorK'"; - QFont f( telnetitem->score->font().rawName(), telnetitem->score->font().pointSize() - 1 ); + TQFont f( telnetitem->score->font().rawName(), telnetitem->score->font().pointSize() - 1 ); telnetitem->score->setFont( f ); telnetitem->score->setHidden(false); telnetitem->score->insertStringList(shellsAvailable); - telnetitem->score->setPalette(QPalette(Qt::white,Qt::white)); + telnetitem->score->setPalette(TQPalette(TQt::white,TQt::white)); connect(telnetitem->score, SIGNAL(activated(int)),telnetitem, SLOT(changeTerminalUrl(int))); Anonymizer->insertItem(telnetitem); - connect(telnetitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(telnetitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } //GPG #endif @@ -2005,9 +2005,9 @@ void torkView::populateMenu() #ifndef LIVECD if ((TorkConfig::availablePrograms().contains("gpg")) && !shellsAvailable.isEmpty()){ - gpgitem = new HitWidget(QString::null, QString::null); + gpgitem = new HitWidget(TQString::null, TQString::null); - headerLabel = new QLabel(gpgitem); + headerLabel = new TQLabel(gpgitem); headerLabel->setText(i18n("Anonymously Refresh GPG Keys")); font.setBold( true ); headerLabel->setFont( font ); @@ -2030,16 +2030,16 @@ void torkView::populateMenu() gpgitem->shellTitles["rxvt"] = " -title 'Anonymous GPG Keys Refresh - Launched From TorK' -e gpg --refresh-keys"; gpgitem->shellTitles["gnome-terminal"] = " --title 'Anonymous GPG Keys Refresh - Launched From TorK' -e gpg --refresh-keys"; - QFont f( gpgitem->score->font().rawName(), gpgitem->score->font().pointSize() - 1 ); + TQFont f( gpgitem->score->font().rawName(), gpgitem->score->font().pointSize() - 1 ); gpgitem->score->setFont( f ); gpgitem->score->setHidden(false); gpgitem->score->insertStringList(hkpShellsAvailable); - gpgitem->score->setPalette(QPalette(Qt::white,Qt::white)); + gpgitem->score->setPalette(TQPalette(TQt::white,TQt::white)); connect(gpgitem->score, SIGNAL(activated(int)),gpgitem, SLOT(changeTerminalUrl(int))); Anonymizer->insertItem(gpgitem); - connect(gpgitem->icon, SIGNAL(leftClickedURL(const QString&)), SLOT(torify(const QString&))); + connect(gpgitem->icon, SIGNAL(leftClickedURL(const TQString&)), SLOT(torify(const TQString&))); } #endif //All Purpose Shell @@ -2048,8 +2048,8 @@ void torkView::populateMenu() #ifndef LIVECD if (!shellsAvailable.isEmpty()){ - allpurposeitem = new HitWidget(QString::null, QString::null); - headerLabel = new QLabel(allpurposeitem); + allpurposeitem = new HitWidget(TQString::null, TQString::null); + headerLabel = new TQLabel(allpurposeitem); headerLabel->setText(i18n("Anonymous Shell for Command-Line Programs using HTTP/HTTPS")); font.setBold( true ); headerLabel->setFont( font ); @@ -2062,11 +2062,11 @@ void torkView::populateMenu() "- Suitable for such programs as <b>wget</b>, <b>slapt-get</b> and <b>lynx</b>. <br>" )+"</qt>"); -// QFont f( allpurposeitem->score->font().rawName(), 8 ); +// TQFont f( allpurposeitem->score->font().rawName(), 8 ); // allpurposeitem->score->setFont( f ); // allpurposeitem->score->setHidden(false); // allpurposeitem->score->insertStringList(shellsAvailable); -// allpurposeitem->score->setPalette(QPalette(Qt::white,Qt::white)); +// allpurposeitem->score->setPalette(TQPalette(TQt::white,TQt::white)); Anonymizer->insertItem(allpurposeitem); @@ -2076,14 +2076,14 @@ void torkView::populateMenu() } -circuitItem::circuitItem( DndListView *parent, const QString &id, const QString &status, const QString &server ) - : QListViewItem( parent, id, status, server) +circuitItem::circuitItem( DndListView *parent, const TQString &id, const TQString &status, const TQString &server ) + : TQListViewItem( parent, id, status, server) { } -streamItem::streamItem( DndListView *parent, const QString &id, const QString &program, const QString &target, const QString &status, const QString &bw, const QString &exit, const QString &circuit ) - : QListViewItem( parent, id, program, target, status, bw, exit, circuit) +streamItem::streamItem( DndListView *parent, const TQString &id, const TQString &program, const TQString &target, const TQString &status, const TQString &bw, const TQString &exit, const TQString &circuit ) + : TQListViewItem( parent, id, program, target, status, bw, exit, circuit) { /* setDragEnabled(true); setDropEnabled(true);*/ diff --git a/src/torkview.h b/src/torkview.h index a13a29a..19ae410 100644 --- a/src/torkview.h +++ b/src/torkview.h @@ -23,7 +23,7 @@ #ifndef _TORKVIEW_H_ #define _TORKVIEW_H_ -#include <qwidget.h> +#include <ntqwidget.h> #include "torkview_base.h" #include "hitwidget.h" @@ -31,18 +31,18 @@ #include "kerrylabel.h" #include "dndlistview.h" -#include <qlistview.h> -#include <qdragobject.h> -#include <qiconview.h> -#include <qdatetime.h> +#include <ntqlistview.h> +#include <ntqdragobject.h> +#include <ntqiconview.h> +#include <ntqdatetime.h> #include <kpassivepopup.h> #include "newstreamosd.h" -class QPainter; +class TQPainter; class KURL; -class QListViewItem; -class QDragEnterEvent; -class QDragDropEvent; +class TQListViewItem; +class TQDragEnterEvent; +class TQDragDropEvent; class KPassivePopup; class StreamOSD; class HitWidget; @@ -70,7 +70,7 @@ public: /** * Default constructor */ - torkView(QWidget *parent); + torkView(TQWidget *parent); /** * Destructor @@ -80,10 +80,10 @@ public: void hidePopup(); bool getShowTormon() {return m_tormon;} void setShowTormon(bool tormon) { m_tormon = tormon;} - void infoUpdated(const QString &type, const QString &summary, - const QString &data); - QStringList subnet16List(){ return m_subnet16List; } - QValueList<int> countryList(){ return m_countryList; } + void infoUpdated(const TQString &type, const TQString &summary, + const TQString &data); + TQStringList subnet16List(){ return m_subnet16List; } + TQValueList<int> countryList(){ return m_countryList; } StreamOSD* m_osd; StreamOSD* m_nontorosd; void toggleAnonymizerTork(bool state); @@ -102,7 +102,7 @@ public: HitWidget* ksircitem; HitWidget* operaitem; HitWidget* firefoxitem; - QValueList<HitWidget*> menuItems; + TQValueList<HitWidget*> menuItems; KURLLabel *configurePriv; KURLLabel *configurePrivText; @@ -164,20 +164,20 @@ public: /// TX Speed in bytes per second inline double sys_byteSpeedTx() const; - static inline QString byteFormat( double num, + static inline TQString byteFormat( double num, const char* ksufix = " KB", const char* msufix = " MB"); void resetBWHistory(); void updateChart(); - QStringList m_subnet16List; - QValueList<int> m_countryList; + TQStringList m_subnet16List; + TQValueList<int> m_countryList; void clearStreamMaps(); - QTime timeLastTorUse; - QTime timeTorWasLastUsed(){return timeLastTorUse;}; - QString addrLastTorUse; - QString addrTorWasLastUsed(){return addrLastTorUse;}; + TQTime timeLastTorUse; + TQTime timeTorWasLastUsed(){return timeLastTorUse;}; + TQString addrLastTorUse; + TQString addrTorWasLastUsed(){return addrLastTorUse;}; void setGeoIPAvailable(bool set){geoip_db = set;}; @@ -186,9 +186,9 @@ signals: /** * Use this signal to change the content of the caption */ - void signalChangeCaption(const QString& text); - void showSecurityNotice(const QString& cleanedPort); - void showScreamingNotice(const QString& cleanedPort); + void signalChangeCaption(const TQString& text); + void showSecurityNotice(const TQString& cleanedPort); + void showScreamingNotice(const TQString& cleanedPort); void showMyKonqueror(); void riskySession(); void aboutTorify(); @@ -200,41 +200,41 @@ signals: void stopEverything(); void updateStats(); void mixminionHome(); - void processWarning(const QString& , const QString& ); + void processWarning(const TQString& , const TQString& ); void signalCheckGuards(); void signalCheckTorNet(); void signalCheckBWSettings(); - void updateTrayStats(const QString &,const QString &, - const QString &,const QString &); + void updateTrayStats(const TQString &,const TQString &, + const TQString &,const TQString &); public slots: void toggleParanoidMode(int); - void torify(const QString &); + void torify(const TQString &); void sendAnonymousEmail(); void anonymousOpera(); void anonymousFirefox(); - void anonymizedOpera(const QString &); - void anonymizedFirefox(const QString &); - void showServerBW(const QString&); + void anonymizedOpera(const TQString &); + void anonymizedFirefox(const TQString &); + void showServerBW(const TQString&); private slots: void switchColors(); void settingsChanged(); - void streamStatusUpdated(const QString &, const QString &, - const QString &, const QString &, - const QString &); - void circuitStatusUpdated(const QString &, const QString &, - const QString &, const QString &); - void ORStatusUpdated(const QString &ORID, const QString &status); - void guardStatusUpdated(const QString &ORID, const QString &status); - void bwUpdated(const QString &in, const QString &out); - void streamBwUpdated(const QString &stream, const QString &in, - const QString &out); - QPixmap streamProgram(const QString &port); - void activeServersUpdated(const QStringList &servers); - void displayError(const QString &,const QString &); - void displayServer(const QString &,const QString &); - void serverStatusUpdated(const QString &, const QString &, - const QString &,const QString &); + void streamStatusUpdated(const TQString &, const TQString &, + const TQString &, const TQString &, + const TQString &); + void circuitStatusUpdated(const TQString &, const TQString &, + const TQString &, const TQString &); + void ORStatusUpdated(const TQString &ORID, const TQString &status); + void guardStatusUpdated(const TQString &ORID, const TQString &status); + void bwUpdated(const TQString &in, const TQString &out); + void streamBwUpdated(const TQString &stream, const TQString &in, + const TQString &out); + TQPixmap streamProgram(const TQString &port); + void activeServersUpdated(const TQStringList &servers); + void displayError(const TQString &,const TQString &); + void displayServer(const TQString &,const TQString &); + void serverStatusUpdated(const TQString &, const TQString &, + const TQString &,const TQString &); void privoxiedBash(); void downloadMixminion(); void downloadTorButton(); @@ -243,61 +243,61 @@ private slots: private: - unsigned long readInterfaceNumValue(QString interface, + unsigned long readInterfaceNumValue(TQString interface, const char* name); void setHiddenServicesText(); - QString parseStreamPort(const QString &); + TQString parseStreamPort(const TQString &); void populateMenu(); bool geoip_db; KPassivePopup* m_pop; bool m_tormon; - QStringList mSysDevPathList; + TQStringList mSysDevPathList; bool mFirstUpdate; bool checkInterface(); bool gotEth0; KURLLabel *paranoidmodeicon; KURLLabel *paranoidmodetext; - QStringList greenonion; - QStringList redonion; - QStringList yellowonion; - QStringList orangeonion; - QStringList littleonion; - QStringList todelete; - QValueList<QStringList> iconList; - QValueList<QString> torType; - - - QStringList guard; - QStringList redguard; - QStringList detachedguard; - QStringList littleguard; - QValueList<QStringList> guardIconList; - QValueList<QStringList> circuitIconList; - - typedef QMap<QString, QString> stringmap; + TQStringList greenonion; + TQStringList redonion; + TQStringList yellowonion; + TQStringList orangeonion; + TQStringList littleonion; + TQStringList todelete; + TQValueList<TQStringList> iconList; + TQValueList<TQString> torType; + + + TQStringList guard; + TQStringList redguard; + TQStringList detachedguard; + TQStringList littleguard; + TQValueList<TQStringList> guardIconList; + TQValueList<TQStringList> circuitIconList; + + typedef TQMap<TQString, TQString> stringmap; stringmap entryGuards; stringmap streamPurpose; stringmap portStream; - typedef QMap<QString, streamItem*> streamlist; + typedef TQMap<TQString, streamItem*> streamlist; streamlist streams; - typedef QMap<QString, QListViewItem*> osdstreamlist; + typedef TQMap<TQString, TQListViewItem*> osdstreamlist; osdstreamlist osdstreams; osdstreamlist logstreams; osdstreamlist torservers; osdstreamlist circuitExits; - typedef QMap<QString, QPixmap> stringToPixmap; + typedef TQMap<TQString, TQPixmap> stringToPixmap; stringToPixmap streamStatusIcon; stringToPixmap cachedStreamIcon; - typedef QMap<QString, int> streamBw; + typedef TQMap<TQString, int> streamBw; streamBw streamBwIn; streamBw streamBwOut; - QLabel *welcomeheaderLabel; + TQLabel *welcomeheaderLabel; unsigned int torbtx; unsigned int torbrx; @@ -366,25 +366,25 @@ double torkView::sys_byteSpeedTx() const { return sys_mSpeedHistoryTx[sys_mSpeedHistoryPtr]; } -QString torkView::byteFormat( double num, const char* ksufix, +TQString torkView::byteFormat( double num, const char* ksufix, const char* msufix ) { const double ONE_KB = 1024.0; const double ONE_MB = ONE_KB*ONE_KB; if ( num >= ONE_MB ) // MB - return QString::number( num/(ONE_MB), 'f', 1 ) + msufix; + return TQString::number( num/(ONE_MB), 'f', 1 ) + msufix; else // Kb - return QString::number( num/ONE_KB, 'f', 1 ) + ksufix; + return TQString::number( num/ONE_KB, 'f', 1 ) + ksufix; } -class streamItem : public QObject, public QListViewItem +class streamItem : public TQObject, public TQListViewItem { Q_OBJECT public: - streamItem( DndListView *parent, const QString &id, - const QString &program, const QString &target, - const QString &status, const QString &bw, - const QString &exit, const QString &circuit ); + streamItem( DndListView *parent, const TQString &id, + const TQString &program, const TQString &target, + const TQString &status, const TQString &bw, + const TQString &exit, const TQString &circuit ); streamItem(); enum { @@ -509,16 +509,16 @@ double streamItem::byteSpeedTx() const { } -class circuitItem : public QObject, public QListViewItem +class circuitItem : public TQObject, public TQListViewItem { Q_OBJECT public: - circuitItem( DndListView *parent, const QString &id, - const QString &status, const QString &server ); + circuitItem( DndListView *parent, const TQString &id, + const TQString &status, const TQString &server ); -// bool acceptDrop( const QMimeSource *mime ) const; -// void dropped ( QDropEvent * e ); +// bool acceptDrop( const TQMimeSource *mime ) const; +// void dropped ( TQDropEvent * e ); // void dragEntered( ); diff --git a/src/torkview_base.ui b/src/torkview_base.ui index c2c5288..3131411 100644 --- a/src/torkview_base.ui +++ b/src/torkview_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>torkview_base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>torkview_base</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>frame4</cstring> </property> @@ -43,7 +43,7 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -62,7 +62,7 @@ <pixmap>image0</pixmap> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -81,7 +81,7 @@ <pixmap>image1</pixmap> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5</cstring> </property> @@ -107,7 +107,7 @@ <enum>Plain</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -126,7 +126,7 @@ <pixmap>image2</pixmap> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>ChartFrame</cstring> </property> @@ -160,7 +160,7 @@ </property> </widget> </widget> - <widget class="QTabWidget" row="1" column="0"> + <widget class="TQTabWidget" row="1" column="0"> <property name="name"> <cstring>TorkTabs</cstring> </property> @@ -178,7 +178,7 @@ <height>0</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Anonymize</cstring> </property> @@ -213,7 +213,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TorNetwork</cstring> </property> @@ -224,14 +224,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter5</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>Network</cstring> </property> @@ -268,7 +268,7 @@ <cstring>serverFilter</cstring> </property> </widget> - <widget class="QToolButton" row="0" column="0"> + <widget class="TQToolButton" row="0" column="0"> <property name="name"> <cstring>clearButton</cstring> </property> @@ -278,14 +278,14 @@ </widget> </grid> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter4</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -319,14 +319,14 @@ </widget> </grid> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter3</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -360,7 +360,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -399,7 +399,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TorLog</cstring> </property> @@ -410,7 +410,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Time</string> @@ -477,7 +477,7 @@ <enum>NoColumn</enum> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>clearInfo</cstring> </property> @@ -502,7 +502,7 @@ </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>ShowHostNames</cstring> </property> @@ -512,7 +512,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TrafficLog</cstring> </property> @@ -523,14 +523,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQSplitter" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>splitter4</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -541,7 +541,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2"> <column> <property name="text"> <string>StreamID</string> @@ -599,7 +599,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>clearTorTraffic</cstring> </property> @@ -626,7 +626,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -637,7 +637,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>clearNonTorTraffic</cstring> </property> @@ -645,7 +645,7 @@ <string>Clear</string> </property> </widget> - <widget class="QListView" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4"> <column> <property name="text"> <string>Time</string> @@ -700,7 +700,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>NonTorTrafficMaxEntries</cstring> </property> @@ -717,7 +717,7 @@ <number>100</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -748,7 +748,7 @@ </grid> </widget> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>kcfg_LogNonTorTraffic</cstring> </property> @@ -759,7 +759,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_LogTorTraffic</cstring> </property> @@ -791,8 +791,8 @@ <verstretch>0</verstretch> </sizepolicy> <pixmap>image3</pixmap> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> - <slot access="public" specifier="">contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> + <slot access="public" specifier="">contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </customwidget> <customwidget> <class>KWidgetListbox</class> @@ -810,7 +810,7 @@ </sizepolicy> <pixmap>image1</pixmap> <signal>selected(int)</signal> - <signal>doubleClicked(int, int, int, const QPoint&)</signal> + <signal>doubleClicked(int, int, int, const TQPoint&)</signal> </customwidget> </customwidgets> <images> @@ -854,39 +854,39 @@ </connection> <connection> <sender>streamList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>streamList_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>streamList_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>circuitList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>circuitList_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>circuitList_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>serverList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>serverList_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>serverList_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>streamList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>stopDisplayingBubble(QListViewItem*,const QPoint&,int)</slot> + <slot>stopDisplayingBubble(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>circuitList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>stopDisplayingBubble(QListViewItem*,const QPoint&,int)</slot> + <slot>stopDisplayingBubble(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>serverList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>stopDisplayingBubble(QListViewItem*,const QPoint&,int)</slot> + <slot>stopDisplayingBubble(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>kcfg_LogNonTorTraffic</sender> @@ -908,30 +908,30 @@ </connection> <connection> <sender>infoList</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>infoList_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>infoList_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>TorTraffic</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>TorTraffic_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>TorTraffic_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>NonTorTraffic</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>torkview_base</receiver> - <slot>NonTorTraffic_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>NonTorTraffic_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> </connections> <includes> <include location="local" impldecl="in implementation">torkview_base.ui.h</include> </includes> <signals> - <signal>closeStream(const QString &)</signal> - <signal>closeCircuit(const QString &)</signal> - <signal>closeAllCircuits( QListView* &)</signal> + <signal>closeStream(const TQString &)</signal> + <signal>closeCircuit(const TQString &)</signal> + <signal>closeAllCircuits( TQListView* &)</signal> <signal>copyOldConfig( )</signal> <signal>attachStreams(bool)</signal> <signal>newIdentity()</signal> @@ -946,16 +946,16 @@ <signal>clearNodes()</signal> <signal>updateStrictExitNodes(bool)</signal> <signal>safeLogging(bool)</signal> - <signal>resolveAddress(const QString &)</signal> + <signal>resolveAddress(const TQString &)</signal> </signals> <slots> - <slot>stopDisplayingBubble( QListViewItem *, const QPoint &, int )</slot> - <slot>streamList_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>stopDisplayingBubble( TQListViewItem *, const TQPoint &, int )</slot> + <slot>streamList_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotAttachStreams()</slot> <slot>slotCloseStream()</slot> - <slot>circuitList_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>circuitList_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotCloseCircuit()</slot> - <slot>serverList_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>serverList_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotClearNodes()</slot> <slot>slotAddToFamily()</slot> <slot>slotAddPermExcludeCountry()</slot> @@ -968,7 +968,7 @@ <slot>slotAddSessionStrictExitNodes()</slot> <slot>slotAddPermEntryNodes()</slot> <slot>slotAddSessionEntryNodes()</slot> - <slot>addExcludeNodes( bool perm, QStringList ccs )</slot> + <slot>addExcludeNodes( bool perm, TQStringList ccs )</slot> <slot>clearInfo_clicked()</slot> <slot>clearTorTraffic_clicked()</slot> <slot>clearNonTorTraffic_clicked()</slot> @@ -982,15 +982,15 @@ <slot>ShowHostNames_toggled( bool safe )</slot> <slot>copyLogLines( )</slot> <slot>selectAllLogLines( )</slot> - <slot>infoList_contextMenuRequested( QListViewItem *, const QPoint &, int )</slot> - <slot>TorTraffic_contextMenuRequested( QListViewItem *, const QPoint &, int )</slot> + <slot>infoList_contextMenuRequested( TQListViewItem *, const TQPoint &, int )</slot> + <slot>TorTraffic_contextMenuRequested( TQListViewItem *, const TQPoint &, int )</slot> <slot>queryHostName( )</slot> - <slot>resolvedAddress( const QString & )</slot> - <slot>NonTorTraffic_contextMenuRequested( QListViewItem *, const QPoint &, int )</slot> + <slot>resolvedAddress( const TQString & )</slot> + <slot>NonTorTraffic_contextMenuRequested( TQListViewItem *, const TQPoint &, int )</slot> </slots> <functions> <function access="private" specifier="non virtual">init()</function> - <function access="private" specifier="non virtual" returnType="QStringList">selectByCountry()</function> + <function access="private" specifier="non virtual" returnType="TQStringList">selectByCountry()</function> <function access="private" specifier="non virtual">addEntryNodes( bool perm )</function> <function access="private" specifier="non virtual">addExitNodes( bool perm, bool strict )</function> </functions> diff --git a/src/torkview_base.ui.h b/src/torkview_base.ui.h index b1bca7b..c15965d 100644 --- a/src/torkview_base.ui.h +++ b/src/torkview_base.ui.h @@ -19,10 +19,10 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> -#include <qclipboard.h> +#include <ntqclipboard.h> #include <kapplication.h> #include <kiconloader.h> @@ -39,16 +39,16 @@ bool m_LeaveStreamsUnattached; -typedef QMap<QString, QListViewItem*> ResolveMap; +typedef TQMap<TQString, TQListViewItem*> ResolveMap; ResolveMap resolveMap; -typedef QMap<QListViewItem*, int > ResolveColMap; +typedef TQMap<TQListViewItem*, int > ResolveColMap; ResolveColMap resolveColMap; void torkview_base::init() { serverFilter->setListView((KListView *)serverList); - QValueList<int> tmp; + TQValueList<int> tmp; tmp << 1; serverFilter->setSearchColumns(tmp); @@ -64,18 +64,18 @@ void torkview_base::init() serverList->addColumn( "countrycode" ); serverList->addColumn( "ip" ); - serverList->setSelectionMode( QListView::Extended ); - serverList->setColumnWidthMode(2, QListView::Manual); + serverList->setSelectionMode( TQListView::Extended ); + serverList->setColumnWidthMode(2, TQListView::Manual); serverList->hideColumn(2); - serverList->setColumnWidthMode(3, QListView::Manual); + serverList->setColumnWidthMode(3, TQListView::Manual); serverList->hideColumn(3); - serverList->setColumnWidthMode(4, QListView::Manual); + serverList->setColumnWidthMode(4, TQListView::Manual); serverList->hideColumn(4); - serverList->setColumnWidthMode(5, QListView::Manual); + serverList->setColumnWidthMode(5, TQListView::Manual); serverList->hideColumn(5); serverList->header()->setResizeEnabled(FALSE, 1); - serverList->setResizeMode( QListView::NoColumn ); - serverList->setHScrollBarMode(QScrollView::AlwaysOff); + serverList->setResizeMode( TQListView::NoColumn ); + serverList->setHScrollBarMode(TQScrollView::AlwaysOff); streamList->addColumn( "ID" ); streamList->addColumn( tr2i18n("Source") ); @@ -85,39 +85,39 @@ void torkview_base::init() streamList->addColumn( tr2i18n("Exit") ); streamList->addColumn( tr2i18n("Circuit") ); - streamList->setSelectionMode( QListView::Extended ); - streamList->setColumnWidthMode(0, QListView::Manual); + streamList->setSelectionMode( TQListView::Extended ); + streamList->setColumnWidthMode(0, TQListView::Manual); streamList->hideColumn(0); streamList->header()->setResizeEnabled(FALSE, 0); - streamList->setResizeMode( QListView::NoColumn ); + streamList->setResizeMode( TQListView::NoColumn ); circuitList->addColumn( tr2i18n( "ID" ) ); circuitList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24 ); circuitList->addColumn( tr2i18n( "Path" ) ); - circuitList->setSelectionMode( QListView::Extended ); - circuitList->setColumnWidthMode(0, QListView::Manual); + circuitList->setSelectionMode( TQListView::Extended ); + circuitList->setColumnWidthMode(0, TQListView::Manual); circuitList->hideColumn(0); circuitList->header()->setResizeEnabled(FALSE, 0); - circuitList->setResizeMode( QListView::LastColumn ); + circuitList->setResizeMode( TQListView::LastColumn ); ORList->addColumn( kapp->iconLoader()->loadIconSet("tork_torsmall", KIcon::Small),"", 24 ); ORList->addColumn( tr2i18n( "Server" ) ); - ORList->setSelectionMode( QListView::Extended ); - ORList->setColumnWidthMode(0, QListView::Manual); - ORList->setResizeMode( QListView::LastColumn ); + ORList->setSelectionMode( TQListView::Extended ); + ORList->setColumnWidthMode(0, TQListView::Manual); + ORList->setResizeMode( TQListView::LastColumn ); - TorTraffic->setColumnWidthMode(0, QListView::Manual); + TorTraffic->setColumnWidthMode(0, TQListView::Manual); TorTraffic->hideColumn(0); TorTraffic->header()->setResizeEnabled(FALSE, 0); - TorTraffic->setResizeMode( QListView::NoColumn ); + TorTraffic->setResizeMode( TQListView::NoColumn ); TorTraffic->setSorting ( 1, true); NonTorTraffic->setSorting ( 0, true); m_LeaveStreamsUnattached = false; - infoList->setColumnWidthMode(1, QListView::Manual); + infoList->setColumnWidthMode(1, TQListView::Manual); infoList->hideColumn(1); infoList->header()->setResizeEnabled(FALSE, 1); infoList->setSorting ( 0, true); @@ -131,15 +131,15 @@ void torkview_base::init() } -void torkview_base::stopDisplayingBubble(QListViewItem*,const QPoint&,int) +void torkview_base::stopDisplayingBubble(TQListViewItem*,const TQPoint&,int) { TorkConfig::setDisplayBubble(false); } -void torkview_base::streamList_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void torkview_base::streamList_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( streamList ); + TQPopupMenu *menu = new TQPopupMenu( streamList ); menu->clear(); @@ -165,7 +165,7 @@ void torkview_base::slotCloseStream( ) { kdDebug() << "deleting entry" << endl; - QListViewItemIterator it(streamList, QListViewItemIterator::Selected); + TQListViewItemIterator it(streamList, TQListViewItemIterator::Selected); while ( it.current() ) { if (streamList->isSelected( it.current())) emit closeStream(it.current()->text(0)); @@ -175,13 +175,13 @@ void torkview_base::slotCloseStream( ) } -void torkview_base::circuitList_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void torkview_base::circuitList_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { if (circuitList->childCount() == 0) return; - QPopupMenu *menu = new QPopupMenu( circuitList ); + TQPopupMenu *menu = new TQPopupMenu( circuitList ); menu->clear(); menu->insertItem( "Close Circuit", this,SLOT(slotCloseCircuit()) ); @@ -194,7 +194,7 @@ void torkview_base::slotCloseCircuit( ) { kdDebug() << "deleting entry" << endl; - QListViewItemIterator it(circuitList, QListViewItemIterator::Selected); + TQListViewItemIterator it(circuitList, TQListViewItemIterator::Selected); while ( it.current() ) { if (circuitList->isSelected( it.current())) emit closeCircuit(it.current()->text(0)); @@ -204,15 +204,15 @@ void torkview_base::slotCloseCircuit( ) } -void torkview_base::serverList_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void torkview_base::serverList_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { if (serverList->childCount() == 0) return; - QPopupMenu *menu = new QPopupMenu( serverList ); - QPopupMenu *m_ThisSession = new KPopupMenu( this ); - QPopupMenu *m_ThisPerm = new KPopupMenu( this ); + TQPopupMenu *menu = new TQPopupMenu( serverList ); + TQPopupMenu *m_ThisSession = new KPopupMenu( this ); + TQPopupMenu *m_ThisPerm = new KPopupMenu( this ); menu->clear(); menu->insertItem( i18n("For This Session Only"), m_ThisSession ); @@ -243,15 +243,15 @@ void torkview_base::slotClearNodes( ) void torkview_base::slotAddToFamily( ) { - QStringList currentList; + TQStringList currentList; currentList = TorkConfig::myFamily(); - QListViewItemIterator it(serverList, QListViewItemIterator::Selected | QListViewItemIterator::Visible); + TQListViewItemIterator it(serverList, TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); while ( it.current() ) { - if (!TorkConfig::myFamily().contains(QString("%1-%2-%3") + if (!TorkConfig::myFamily().contains(TQString("%1-%2-%3") .arg((*it)->text(4)).arg((*it)->text(2)).arg((*it)->text(1)))){ - QStringList existingServers = TorkConfig::myFamily(); - existingServers.append(QString("%1-%2-%3") + TQStringList existingServers = TorkConfig::myFamily(); + existingServers.append(TQString("%1-%2-%3") .arg((*it)->text(4)).arg((*it)->text(2)).arg((*it)->text(1))); TorkConfig::setMyFamily(existingServers); } @@ -262,10 +262,10 @@ void torkview_base::slotAddToFamily( ) void torkview_base::slotAddPermExcludeCountry( ) { - QStringList selectedCountries = selectByCountry(); + TQStringList selectedCountries = selectByCountry(); - QStringList newCountries = TorkConfig::excludeCountries(); - for ( QStringList::Iterator it = selectedCountries.begin(); it != selectedCountries.end(); ++it ) + TQStringList newCountries = TorkConfig::excludeCountries(); + for ( TQStringList::Iterator it = selectedCountries.begin(); it != selectedCountries.end(); ++it ) { if ((!TorkConfig::excludeCountries().contains(*it)) && (!newCountries.contains(*it))) @@ -278,17 +278,17 @@ void torkview_base::slotAddPermExcludeCountry( ) void torkview_base::slotAddPermExcludeNodes( ) { - addExcludeNodes(true, QStringList()); + addExcludeNodes(true, TQStringList()); } -QStringList torkview_base::selectByCountry( ) +TQStringList torkview_base::selectByCountry( ) { - QStringList selectCountries; + TQStringList selectCountries; - QListViewItemIterator it(serverList, QListViewItemIterator::Selected | QListViewItemIterator::Visible); + TQListViewItemIterator it(serverList, TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); while ( it.current() ) { - QString cc = (*it)->text(4); + TQString cc = (*it)->text(4); selectCountries.append(cc); ++it; } @@ -303,7 +303,7 @@ void torkview_base::slotAddSessionExcludeCountry( ) void torkview_base::slotAddSessionExcludeNodes( ) { - addExcludeNodes(false, QStringList()); + addExcludeNodes(false, TQStringList()); } void torkview_base::slotAddPermExitNodes( ) @@ -336,21 +336,21 @@ void torkview_base::slotAddSessionEntryNodes( ) addEntryNodes(false); } -void torkview_base::addExcludeNodes(bool perm, QStringList ccs ) +void torkview_base::addExcludeNodes(bool perm, TQStringList ccs ) { - QStringList currentList; + TQStringList currentList; currentList = TorkConfig::currentExcludeNodes(); - QStringList permList; + TQStringList permList; permList = TorkConfig::excludeNodes(); - QListViewItemIterator::IteratorFlag filter; + TQListViewItemIterator::IteratorFlag filter; if (ccs.isEmpty()) - filter = QListViewItemIterator::IteratorFlag(QListViewItemIterator::Selected | QListViewItemIterator::Visible); + filter = TQListViewItemIterator::IteratorFlag(TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); else - filter = QListViewItemIterator::IteratorFlag(); + filter = TQListViewItemIterator::IteratorFlag(); - QListViewItemIterator it(serverList, filter); + TQListViewItemIterator it(serverList, filter); while ( it.current() ) { if (!ccs.isEmpty()){ @@ -360,14 +360,14 @@ void torkview_base::addExcludeNodes(bool perm, QStringList ccs ) } } - QString node = "$"+getFPFromFPDigest((*it)->text(2)); + TQString node = "$"+getFPFromFPDigest((*it)->text(2)); currentList.append(node); if (perm){ permList.append(node); - if (!TorkConfig::excludeServersHistory().contains(QString("%1-%2-%3") + if (!TorkConfig::excludeServersHistory().contains(TQString("%1-%2-%3") .arg((*it)->text(4)).arg((*it)->text(2)).arg((*it)->text(1)))){ - QStringList existingServers = TorkConfig::excludeServersHistory(); - existingServers.append(QString("%1-%2-%3") + TQStringList existingServers = TorkConfig::excludeServersHistory(); + existingServers.append(TQString("%1-%2-%3") .arg((*it)->text(4)).arg((*it)->text(2)).arg((*it)->text(1))); TorkConfig::setExcludeServersHistory(existingServers); } @@ -379,7 +379,7 @@ void torkview_base::addExcludeNodes(bool perm, QStringList ccs ) TorkConfig::setCurrentExcludeNodes(currentList); TorkConfig::setExcludeNodes(permList); - QListView* tmp = dynamic_cast<QListView*>(circuitList); + TQListView* tmp = dynamic_cast<TQListView*>(circuitList); emit closeAllCircuits(tmp); emit updateExcludeNodes(); @@ -390,14 +390,14 @@ void torkview_base::addExcludeNodes(bool perm, QStringList ccs ) void torkview_base::addEntryNodes( bool perm ) { - QStringList currentList; + TQStringList currentList; currentList = TorkConfig::currentEntryNodes(); - QStringList permList; + TQStringList permList; permList = TorkConfig::entryNodes(); - QListViewItemIterator it(serverList, QListViewItemIterator::Selected | QListViewItemIterator::Visible); + TQListViewItemIterator it(serverList, TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); while ( it.current() ) { - QString node = "$"+getFPFromFPDigest((*it)->text(2)); + TQString node = "$"+getFPFromFPDigest((*it)->text(2)); currentList.append(node); if (perm) permList.append(node); @@ -407,7 +407,7 @@ void torkview_base::addEntryNodes( bool perm ) TorkConfig::setCurrentEntryNodes(currentList); TorkConfig::setEntryNodes(permList); emit copyOldConfig(); - QListView* tmp = dynamic_cast<QListView*>(circuitList); + TQListView* tmp = dynamic_cast<TQListView*>(circuitList); emit closeAllCircuits(tmp); emit updateEntryNodes(); @@ -416,21 +416,21 @@ void torkview_base::addEntryNodes( bool perm ) void torkview_base::addExitNodes(bool perm , bool strict) { - QStringList currentList; + TQStringList currentList; currentList = TorkConfig::currentExitNodes(); - QStringList permList; + TQStringList permList; permList = TorkConfig::exitNodes(); - QListViewItemIterator it(serverList, QListViewItemIterator::Selected | QListViewItemIterator::Visible); + TQListViewItemIterator it(serverList, TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); while ( it.current() ) { - QString node = "$"+getFPFromFPDigest((*it)->text(2)); + TQString node = "$"+getFPFromFPDigest((*it)->text(2)); currentList.append(node); if (perm){ permList.append(node); - if (!TorkConfig::includeServersHistory().contains(QString("%1-%2-%3") + if (!TorkConfig::includeServersHistory().contains(TQString("%1-%2-%3") .arg((*it)->text(4)).arg((*it)->text(2)).arg((*it)->text(1)))){ - QStringList existingServers = TorkConfig::includeServersHistory(); - existingServers.append(QString("%1-%2-%3") + TQStringList existingServers = TorkConfig::includeServersHistory(); + existingServers.append(TQString("%1-%2-%3") .arg((*it)->text(4)).arg((*it)->text(2)).arg((*it)->text(1))); TorkConfig::setIncludeServersHistory(existingServers); } @@ -444,7 +444,7 @@ void torkview_base::addExitNodes(bool perm , bool strict) if (perm) TorkConfig::setStrictExitNodes(strict); - QListView* tmp = dynamic_cast<QListView*>(circuitList); + TQListView* tmp = dynamic_cast<TQListView*>(circuitList); emit closeAllCircuits(tmp); emit updateExitNodes(); @@ -530,10 +530,10 @@ void torkview_base::ShowHostNames_toggled( bool safe) void torkview_base::copyLogLines() { - QClipboard *cb = QApplication::clipboard(); - QString logLines; + TQClipboard *cb = TQApplication::clipboard(); + TQString logLines; - QListViewItemIterator it(infoList, QListViewItemIterator::Selected | QListViewItemIterator::Visible); + TQListViewItemIterator it(infoList, TQListViewItemIterator::Selected | TQListViewItemIterator::Visible); while ( it.current() ) { // Copy text into the clipboard logLines.append((*it)->text(0)); @@ -546,13 +546,13 @@ void torkview_base::copyLogLines() ++it; } - cb->setText( logLines, QClipboard::Clipboard ); + cb->setText( logLines, TQClipboard::Clipboard ); } void torkview_base::selectAllLogLines() { - QListViewItemIterator it(infoList); + TQListViewItemIterator it(infoList); while ( it.current() ) { (*it)->setSelected(true); ++it; @@ -560,9 +560,9 @@ void torkview_base::selectAllLogLines() infoList->repaint(); } -void torkview_base::infoList_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void torkview_base::infoList_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( infoList ); + TQPopupMenu *menu = new TQPopupMenu( infoList ); menu->clear(); menu->insertItem( SmallIconSet("copy"), "Copy", this, SLOT(copyLogLines()) ); @@ -573,10 +573,10 @@ void torkview_base::infoList_contextMenuRequested( QListViewItem *, const QPoint } -void torkview_base::TorTraffic_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void torkview_base::TorTraffic_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( TorTraffic ); + TQPopupMenu *menu = new TQPopupMenu( TorTraffic ); menu->clear(); menu->insertItem( SmallIconSet("help"), "Resolve Hostname/Address", this, SLOT(queryHostName()) ); @@ -586,12 +586,12 @@ void torkview_base::TorTraffic_contextMenuRequested( QListViewItem *, const QPoi void torkview_base::queryHostName() { - QRegExp rx("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"); - QRegExp rx2("[^:]+"); + TQRegExp rx("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}"); + TQRegExp rx2("[^:]+"); - QListView *tmpList; - QString addressToResolve; - QString addressToMatch; + TQListView *tmpList; + TQString addressToResolve; + TQString addressToMatch; if (TorTraffic->hasFocus()) { tmpList = TorTraffic; @@ -601,12 +601,12 @@ void torkview_base::queryHostName() int col = (tmpList == TorTraffic) ? 2 : 1; rx.search(tmpList->selectedItem()->text(col)); - QString tmp = rx.cap(0); + TQString tmp = rx.cap(0); rx2.search(tmpList->selectedItem()->text(col)); - QString tmp2 = rx2.cap(0); + TQString tmp2 = rx2.cap(0); if (!tmp.isEmpty()){ - addressToMatch = QString("REVERSE[%1]").arg(tmp); + addressToMatch = TQString("REVERSE[%1]").arg(tmp); addressToResolve = tmp; }else{ addressToResolve = tmp2; @@ -619,10 +619,10 @@ void torkview_base::queryHostName() emit resolveAddress(addressToResolve); } -void torkview_base::resolvedAddress(const QString &info) +void torkview_base::resolvedAddress(const TQString &info) { - QString type = info.section(" ",0,0); - QString address = info.section(" ",1,1); + TQString type = info.section(" ",0,0); + TQString address = info.section(" ",1,1); if (resolveMap[type]){ int column = resolveColMap[resolveMap[type]]; @@ -632,9 +632,9 @@ void torkview_base::resolvedAddress(const QString &info) } } -void torkview_base::NonTorTraffic_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void torkview_base::NonTorTraffic_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( NonTorTraffic ); + TQPopupMenu *menu = new TQPopupMenu( NonTorTraffic ); menu->clear(); menu->insertItem( SmallIconSet("help"), "Resolve Hostname/Address", this, SLOT(queryHostName()) ); diff --git a/src/torservers.ui b/src/torservers.ui index bad5983..ce00cbe 100644 --- a/src/torservers.ui +++ b/src/torservers.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TorServers</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TorServers</cstring> </property> @@ -30,11 +30,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="2" rowspan="4" colspan="1"> + <widget class="TQListView" row="0" column="2" rowspan="4" colspan="1"> <column> <property name="text"> <string>CC</string> @@ -103,7 +103,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QListBox" row="3" column="0"> + <widget class="TQListBox" row="3" column="0"> <property name="name"> <cstring>CountryList</cstring> </property> @@ -117,7 +117,7 @@ <enum>Multi</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -159,7 +159,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel7_2_2_2</cstring> </property> @@ -169,7 +169,7 @@ <p> To select a country or server, right-click on a server in the 'Tor Network' window and select 'From Now On Never Use At All' or 'From Now On Never Use Country At All'. </p></string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>clearSelectedNodes</cstring> </property> @@ -180,7 +180,7 @@ <string>Alt+D</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>clearSelectedCountries</cstring> </property> @@ -193,7 +193,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -204,7 +204,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="1"> + <widget class="TQListView" row="0" column="1"> <column> <property name="text"> <string>CC</string> @@ -262,7 +262,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>clearSelectedPreferredNodes</cstring> </property> @@ -273,7 +273,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_StrictExitNodes</cstring> </property> @@ -284,7 +284,7 @@ <string>Alt+Y</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel7_2</cstring> </property> @@ -295,7 +295,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -306,7 +306,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel7_2_2_2_2</cstring> </property> @@ -314,12 +314,12 @@ <string><p> This is the list of servers you like to use for particular destinations. For example, all traffic to Google should pop out on to the internet from the friendly server 'trustme'.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>Destination</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="4"> + <widget class="TQPushButton" row="1" column="4"> <property name="name"> <cstring>pushButton6</cstring> </property> @@ -330,7 +330,7 @@ <string>Alt+K</string> </property> </widget> - <widget class="QComboBox" row="1" column="2"> + <widget class="TQComboBox" row="1" column="2"> <property name="name"> <cstring>CandidateList</cstring> </property> @@ -338,7 +338,7 @@ <bool>true</bool> </property> </widget> - <widget class="QListView" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQListView" row="0" column="1" rowspan="1" colspan="4"> <column> <property name="text"> <string>Destination </string> @@ -385,7 +385,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QComboBox" row="1" column="3"> + <widget class="TQComboBox" row="1" column="3"> <item> <property name="text"> <string>Entry</string> @@ -402,7 +402,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget8</cstring> </property> @@ -413,7 +413,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox14</cstring> </property> @@ -424,7 +424,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -432,7 +432,7 @@ <string>You can direct your traffic over <br> servers that haven't been verified <br> yet. Choose the stages in the route over the internet you feel comfortable trusting unverified servers with.</string> </property> </widget> - <widget class="QListView" row="0" column="1"> + <widget class="TQListView" row="0" column="1"> <column> <property name="text"> <string>Position on Circuit</string> @@ -494,7 +494,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>pushButton6_2</cstring> </property> @@ -504,7 +504,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox19</cstring> </property> @@ -515,7 +515,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel6_3</cstring> </property> @@ -523,7 +523,7 @@ <string>seconds</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>kcfg_NewCircuitPeriod</cstring> </property> @@ -531,7 +531,7 @@ <number>99999</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel6_2_2</cstring> </property> @@ -549,15 +549,15 @@ <connections> <connection> <sender>MapAddress</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>TorServers</receiver> - <slot>MapAddress_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>MapAddress_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>MapAddress</sender> - <signal>returnPressed(QListViewItem*)</signal> + <signal>returnPressed(TQListViewItem*)</signal> <receiver>TorServers</receiver> - <slot>MapAddress_returnPressed(QListViewItem*)</slot> + <slot>MapAddress_returnPressed(TQListViewItem*)</slot> </connection> <connection> <sender>pushButton6</sender> @@ -601,9 +601,9 @@ </includes> <slots> <slot>pushButton6_clicked()</slot> - <slot>MapAddress_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>MapAddress_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> - <slot>MapAddress_returnPressed( QListViewItem * )</slot> + <slot>MapAddress_returnPressed( TQListViewItem * )</slot> <slot>clearSelectedCountries_clicked()</slot> <slot>clearSelectedNodes_clicked()</slot> <slot>clearSelectedPreferredNodes_clicked()</slot> @@ -613,7 +613,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">destroy()</function> - <function specifier="non virtual" returnType="QString">ccode( const QString & country )</function> + <function specifier="non virtual" returnType="TQString">ccode( const TQString & country )</function> </functions> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/src/torservers.ui.h b/src/torservers.ui.h index caf7021..0468241 100644 --- a/src/torservers.ui.h +++ b/src/torservers.ui.h @@ -21,8 +21,8 @@ #include "torkconfig.h" #include "crypto.h" #include <klocale.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> #include <kiconloader.h> @@ -32,63 +32,63 @@ # include <GeoIP.h> #endif -typedef QMap<QString, QString> codemap; -QString ccode; -QString cname; +typedef TQMap<TQString, TQString> codemap; +TQString ccode; +TQString cname; codemap ccodes; -QStringList blockCCs; +TQStringList blockCCs; void TorServers::init() { - ExcludeNodes->setSelectionMode( QListView::Extended ); - ExcludeNodes->setColumnWidthMode(0, QListView::Manual); + ExcludeNodes->setSelectionMode( TQListView::Extended ); + ExcludeNodes->setColumnWidthMode(0, TQListView::Manual); ExcludeNodes->hideColumn(0); ExcludeNodes->header()->setResizeEnabled(FALSE, 0); - ExcludeNodes->setColumnWidthMode(1, QListView::Manual); + ExcludeNodes->setColumnWidthMode(1, TQListView::Manual); ExcludeNodes->hideColumn(1); ExcludeNodes->header()->setResizeEnabled(FALSE, 1); - ExcludeNodes->setColumnWidthMode(2, QListView::Manual); + ExcludeNodes->setColumnWidthMode(2, TQListView::Manual); ExcludeNodes->hideColumn(2); ExcludeNodes->header()->setResizeEnabled(FALSE, 2); - ExcludeNodes->setResizeMode( QListView::LastColumn ); + ExcludeNodes->setResizeMode( TQListView::LastColumn ); - ExitNodes->setSelectionMode( QListView::Extended ); - ExitNodes->setColumnWidthMode(0, QListView::Manual); + ExitNodes->setSelectionMode( TQListView::Extended ); + ExitNodes->setColumnWidthMode(0, TQListView::Manual); ExitNodes->hideColumn(0); ExitNodes->header()->setResizeEnabled(FALSE, 0); - ExitNodes->setColumnWidthMode(1, QListView::Manual); + ExitNodes->setColumnWidthMode(1, TQListView::Manual); ExitNodes->hideColumn(1); ExitNodes->header()->setResizeEnabled(FALSE, 1); - ExitNodes->setColumnWidthMode(2, QListView::Manual); + ExitNodes->setColumnWidthMode(2, TQListView::Manual); ExitNodes->hideColumn(2); ExitNodes->header()->setResizeEnabled(FALSE, 2); - ExitNodes->setResizeMode( QListView::LastColumn ); - QListViewItem *tm; - QString fp; - QString nick; - QString geoipcc; - QString countryName; - - QStringList excludeCountries = TorkConfig::excludeCountries(); - for ( QStringList::Iterator it = excludeCountries.begin(); it != excludeCountries.end(); ++it ) + ExitNodes->setResizeMode( TQListView::LastColumn ); + TQListViewItem *tm; + TQString fp; + TQString nick; + TQString geoipcc; + TQString countryName; + + TQStringList excludeCountries = TorkConfig::excludeCountries(); + for ( TQStringList::Iterator it = excludeCountries.begin(); it != excludeCountries.end(); ++it ) { countryName = GeoIP_country_name[(*it).toInt()]; ccodes[countryName] = (*it); CountryList->insertItem(countryName); } -// QStringList preferredCountries = TorkConfig::preferredCountries(); -// for ( QStringList::Iterator it = preferredCountries.begin(); it != preferredCountries.end(); ++it ) +// TQStringList preferredCountries = TorkConfig::preferredCountries(); +// for ( TQStringList::Iterator it = preferredCountries.begin(); it != preferredCountries.end(); ++it ) // { // countryName = GeoIP_country_name[(*it).toInt()]; // ccodes[countryName] = (*it); // PreferredCountryList->insertItem(countryName); // } - QStringList existingServers = TorkConfig::excludeServersHistory(); + TQStringList existingServers = TorkConfig::excludeServersHistory(); - for ( QStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) + for ( TQStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) { if ((*it).isEmpty()) continue; @@ -100,15 +100,15 @@ void TorServers::init() nick = (*it).section("-",2); countryName = GeoIP_country_name[(geoipcc).toInt()]; - tm = new QListViewItem(ExcludeNodes,countryName,geoipcc,fp,nick); - tm->setPixmap(3,QPixmap(SmallIcon("tork_" + QString(GeoIP_country_code[geoipcc.toInt()]).lower()))); + tm = new TQListViewItem(ExcludeNodes,countryName,geoipcc,fp,nick); + tm->setPixmap(3,TQPixmap(SmallIcon("tork_" + TQString(GeoIP_country_code[geoipcc.toInt()]).lower()))); } existingServers = TorkConfig::includeServersHistory(); - for ( QStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) + for ( TQStringList::Iterator it = existingServers.begin(); it != existingServers.end(); ++it ) { if ((*it).isEmpty()) @@ -121,27 +121,27 @@ void TorServers::init() nick = (*it).section("-",2); countryName = GeoIP_country_name[(geoipcc).toInt()]; - tm = new QListViewItem(ExitNodes,countryName,geoipcc,fp,nick); - tm->setPixmap(3,QPixmap(SmallIcon("tork_" + QString(GeoIP_country_code[geoipcc.toInt()]).lower()))); + tm = new TQListViewItem(ExitNodes,countryName,geoipcc,fp,nick); + tm->setPixmap(3,TQPixmap(SmallIcon("tork_" + TQString(GeoIP_country_code[geoipcc.toInt()]).lower()))); // CandidateList->insertItem( nick ); } - QStringList mapAddresses = TorkConfig::mapAddress(); + TQStringList mapAddresses = TorkConfig::mapAddress(); - for ( QStringList::Iterator it = mapAddresses.begin(); it != mapAddresses.end(); ++it ) + for ( TQStringList::Iterator it = mapAddresses.begin(); it != mapAddresses.end(); ++it ) { if ((*it).isEmpty()) continue; - QString entry = (*it).section(" ",1,1); - QString destination = entry.section(".",0,-3); - QString server = entry.section(".",-2,-2); - QString waypoint = entry.section(".",-1,-1); + TQString entry = (*it).section(" ",1,1); + TQString destination = entry.section(".",0,-3); + TQString server = entry.section(".",-2,-2); + TQString waypoint = entry.section(".",-1,-1); - tm = new QListViewItem(MapAddress,destination,server,waypoint); + tm = new TQListViewItem(MapAddress,destination,server,waypoint); } - QListViewItemIterator it(AllowUnverifiedNodes); + TQListViewItemIterator it(AllowUnverifiedNodes); while ( it.current() ) { if (TorkConfig::allowUnverifiedNodes().contains(it.current()->text(0))) AllowUnverifiedNodes->setSelected(*it,true); @@ -157,7 +157,7 @@ void TorServers::init() void TorServers::destroy() { -// QStringList cclist; +// TQStringList cclist; // for (unsigned int index = 0; index != CountryList->count(); ++index){ // cclist.append(ccodes[CountryList->item(index)->text()]); // } @@ -173,7 +173,7 @@ void TorServers::destroy() } -QString TorServers::ccode(const QString &country) +TQString TorServers::ccode(const TQString &country) { return ccodes[country]; } @@ -181,15 +181,15 @@ QString TorServers::ccode(const QString &country) void TorServers::pushButton6_clicked() { - new QListViewItem(MapAddress,Destination->text(), CandidateList->currentText(), WayPoints->currentText()); + new TQListViewItem(MapAddress,Destination->text(), CandidateList->currentText(), WayPoints->currentText()); } -void TorServers::MapAddress_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void TorServers::MapAddress_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( MapAddress ); + TQPopupMenu *menu = new TQPopupMenu( MapAddress ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -201,7 +201,7 @@ void TorServers::MapAddress_contextMenuRequested( QListViewItem *, const QPoint void TorServers::slotDeleteEntry( ) { - QListViewItemIterator it(MapAddress, QListViewItemIterator::Selected); + TQListViewItemIterator it(MapAddress, TQListViewItemIterator::Selected); while ( it.current() ) { if (MapAddress->isSelected( it.current())) delete it.current(); @@ -212,7 +212,7 @@ void TorServers::slotDeleteEntry( ) } -void TorServers::MapAddress_returnPressed( QListViewItem * ) +void TorServers::MapAddress_returnPressed( TQListViewItem * ) { } @@ -221,9 +221,9 @@ void TorServers::MapAddress_returnPressed( QListViewItem * ) void TorServers::clearSelectedCountries_clicked() { - QValueList<QListViewItem*> itemsToDelete; + TQValueList<TQListViewItem*> itemsToDelete; - QListViewItemIterator it(ExcludeNodes, QListViewItemIterator::Selected); + TQListViewItemIterator it(ExcludeNodes, TQListViewItemIterator::Selected); while ( it.current() ) { if (CountryList->findItem(it.current()->text(0))->isSelected()){ itemsToDelete << it.current(); @@ -231,18 +231,18 @@ void TorServers::clearSelectedCountries_clicked() ++it; } - for ( QValueList<QListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ + for ( TQValueList<TQListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ delete (*itt); } - QValueList<QListBoxItem*> countriesToDelete; + TQValueList<TQListBoxItem*> countriesToDelete; for (unsigned int index = 0; index != CountryList->count(); ++index){ if (CountryList->item(index)->isSelected() ) countriesToDelete << CountryList->item(index); } - for ( QValueList<QListBoxItem*>::Iterator itb = countriesToDelete.begin(); + for ( TQValueList<TQListBoxItem*>::Iterator itb = countriesToDelete.begin(); itb != countriesToDelete.end(); ++itb ){ delete (*itb); } @@ -254,15 +254,15 @@ void TorServers::clearSelectedCountries_clicked() void TorServers::clearSelectedNodes_clicked() { - QValueList<QListViewItem*> itemsToDelete; + TQValueList<TQListViewItem*> itemsToDelete; - QListViewItemIterator it(ExcludeNodes, QListViewItemIterator::Selected); + TQListViewItemIterator it(ExcludeNodes, TQListViewItemIterator::Selected); while ( it.current() ) { itemsToDelete << it.current(); ++it; } - for ( QValueList<QListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ + for ( TQValueList<TQListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ delete (*itt); } @@ -273,9 +273,9 @@ void TorServers::clearSelectedNodes_clicked() // void TorServers::clearSelectedPreferredCountries_clicked() // { // -// QValueList<QListViewItem*> itemsToDelete; +// TQValueList<TQListViewItem*> itemsToDelete; // -// QListViewItemIterator it(ExitNodes, QListViewItemIterator::Selected); +// TQListViewItemIterator it(ExitNodes, TQListViewItemIterator::Selected); // while ( it.current() ) { // if (PreferredCountryList->findItem(it.current()->text(0))->isSelected()){ // itemsToDelete << it.current(); @@ -283,18 +283,18 @@ void TorServers::clearSelectedNodes_clicked() // ++it; // } // -// for ( QValueList<QListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ +// for ( TQValueList<TQListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ // delete (*itt); // } // -// QValueList<QListBoxItem*> countriesToDelete; +// TQValueList<TQListBoxItem*> countriesToDelete; // // for (unsigned int index = 0; index != PreferredCountryList->count(); ++index){ // if (PreferredCountryList->item(index)->isSelected() ) // countriesToDelete << PreferredCountryList->item(index); // } // -// for ( QValueList<QListBoxItem*>::Iterator itb = countriesToDelete.begin(); +// for ( TQValueList<TQListBoxItem*>::Iterator itb = countriesToDelete.begin(); // itb != countriesToDelete.end(); ++itb ){ // delete (*itb); // } @@ -306,15 +306,15 @@ void TorServers::clearSelectedNodes_clicked() void TorServers::clearSelectedPreferredNodes_clicked() { - QValueList<QListViewItem*> itemsToDelete; + TQValueList<TQListViewItem*> itemsToDelete; - QListViewItemIterator it(ExitNodes, QListViewItemIterator::Selected); + TQListViewItemIterator it(ExitNodes, TQListViewItemIterator::Selected); while ( it.current() ) { itemsToDelete << it.current(); ++it; } - for ( QValueList<QListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ + for ( TQValueList<TQListViewItem*>::Iterator itt = itemsToDelete.begin(); itt != itemsToDelete.end(); ++itt ){ delete (*itt); } @@ -329,7 +329,7 @@ void TorServers::clearSelectedPreferredNodes_clicked() void TorServers::pushButton6_2_clicked() { - QListViewItemIterator it(AllowUnverifiedNodes, QListViewItemIterator::Selected); + TQListViewItemIterator it(AllowUnverifiedNodes, TQListViewItemIterator::Selected); while ( it.current() ) { it.current()->listView()->setSelected(it.current(),false); ++it; @@ -340,7 +340,7 @@ void TorServers::pushButton6_2_clicked() void TorServers::CountryList_clicked( ) { - QStringList selectedCountries; + TQStringList selectedCountries; for ( unsigned int i = 0; i < CountryList->count(); ++i){ if (CountryList->isSelected(i)){ selectedCountries.append(CountryList->item(i)->text()); @@ -348,9 +348,9 @@ void TorServers::CountryList_clicked( ) } kdDebug() << "country list clicked" << endl; - QListViewItemIterator it( ExcludeNodes ); + TQListViewItemIterator it( ExcludeNodes ); while ( it.current() ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); if (selectedCountries.contains(item->text(0))) item->setSelected(true); else @@ -361,12 +361,12 @@ void TorServers::CountryList_clicked( ) } -// void TorServers::PreferredCountryList_clicked( QListBoxItem * curitem) +// void TorServers::PreferredCountryList_clicked( TQListBoxItem * curitem) // { // -// QListViewItemIterator it( ExitNodes ); +// TQListViewItemIterator it( ExitNodes ); // while ( it.current() ) { -// QListViewItem *item = it.current(); +// TQListViewItem *item = it.current(); // if (curitem){ // if (item->text(0) == curitem->text()) // item->setSelected(curitem->isSelected()); @@ -388,15 +388,15 @@ void TorServers::CountryList_clicked( ) // </connection> // <connection> // <sender>MapAddress</sender> -// <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> +// <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> // <receiver>TorServers</receiver> -// <slot>MapAddress_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> +// <slot>MapAddress_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> // </connection> // <connection> // <sender>MapAddress</sender> -// <signal>returnPressed(QListViewItem*)</signal> +// <signal>returnPressed(TQListViewItem*)</signal> // <receiver>TorServers</receiver> -// <slot>MapAddress_returnPressed(QListViewItem*)</slot> +// <slot>MapAddress_returnPressed(TQListViewItem*)</slot> // </connection> // <connection> // <sender>clearSelected</sender> @@ -434,9 +434,9 @@ void TorServers::CountryList_clicked( ) // </includes> // <slots> // <slot>pushButton6_clicked()</slot> -// <slot>MapAddress_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> +// <slot>MapAddress_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> // <slot>slotDeleteEntry()</slot> -// <slot>MapAddress_returnPressed( QListViewItem * )</slot> +// <slot>MapAddress_returnPressed( TQListViewItem * )</slot> // <slot>clearSelected_clicked()</slot> // <slot>clearSelected_2_clicked()</slot> // <slot>clearSelected_3_clicked()</slot> diff --git a/src/trayhoverpopup.cpp b/src/trayhoverpopup.cpp index 2c63fd0..4e8e8bb 100644 --- a/src/trayhoverpopup.cpp +++ b/src/trayhoverpopup.cpp @@ -37,16 +37,16 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qvbox.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qpixmap.h> +#include <ntqvbox.h> +#include <ntqhbox.h> +#include <ntqlabel.h> +#include <ntqtooltip.h> +#include <ntqpixmap.h> #include <kdialog.h> #include "trayhoverpopup.h" -TrayHoverPopup::TrayHoverPopup(const QPixmap & pix,QWidget *parent, const char *name ) +TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *parent, const char *name ) : KPassivePopup(KPassivePopup::Boxed,parent,name),pix(pix) { setTimeout(0); @@ -54,7 +54,7 @@ TrayHoverPopup::TrayHoverPopup(const QPixmap & pix,QWidget *parent, const char * connect(&hover_timer,SIGNAL(timeout()),this,SLOT(onHoverTimeout())); connect(&show_timer,SIGNAL(timeout()),this,SLOT(onShowTimeout())); create(); - setPalette(QToolTip::palette()); + setPalette(TQToolTip::palette()); setLineWidth(1); context_menu_shown = false; cursor_over_icon = false; @@ -114,38 +114,38 @@ void TrayHoverPopup::onShowTimeout() show(); } -void TrayHoverPopup::updateText(const QString & msg) +void TrayHoverPopup::updateText(const TQString & msg) { text->setText(msg); } void TrayHoverPopup::create() { - QVBox *vb = new QVBox(this); + TQVBox *vb = new TQVBox(this); vb->setSpacing(KDialog::spacingHint()); - QHBox *hb=0; + TQHBox *hb=0; if (!pix.isNull()) { - hb = new QHBox(vb); + hb = new TQHBox(vb); hb->setMargin(0); hb->setSpacing(KDialog::spacingHint()); - QLabel* pix_lbl = new QLabel(hb,"title_icon"); + TQLabel* pix_lbl = new TQLabel(hb,"title_icon"); pix_lbl->setPixmap(pix); pix_lbl->setAlignment(AlignLeft); } - QLabel* title = new QLabel("Tor Status", hb ? hb : vb, "title_label" ); - QFont fnt = title->font(); + TQLabel* title = new TQLabel("Tor Status", hb ? hb : vb, "title_label" ); + TQFont fnt = title->font(); fnt.setBold( true ); title->setFont( fnt ); - title->setAlignment( Qt::AlignHCenter ); + title->setAlignment( TQt::AlignHCenter ); if ( hb ) hb->setStretchFactor(title, 10 ); // enforce centering // text will be filled later - text = new QLabel( "Dummy", vb, "msg_label" ); + text = new TQLabel( "Dummy", vb, "msg_label" ); text->setAlignment( AlignLeft ); setView(vb); } diff --git a/src/trayhoverpopup.h b/src/trayhoverpopup.h index ee03f6a..913b778 100644 --- a/src/trayhoverpopup.h +++ b/src/trayhoverpopup.h @@ -40,11 +40,11 @@ #ifndef TRAYHOVERPOPUP_H #define TRAYHOVERPOPUP_H -#include <qtimer.h> +#include <ntqtimer.h> #include <kpassivepopup.h> -class QLabel; -class QPixmap; +class TQLabel; +class TQPixmap; /** @author Joris Guisson <joris.guisson@gmail.com> @@ -55,7 +55,7 @@ class TrayHoverPopup : public KPassivePopup { Q_OBJECT public: - TrayHoverPopup(const QPixmap & pix,QWidget *parent = 0, const char *name = 0 ); + TrayHoverPopup(const TQPixmap & pix,TQWidget *parent = 0, const char *name = 0 ); virtual ~TrayHoverPopup(); /// Cursor entered system tray icon @@ -65,7 +65,7 @@ public: void leaveEvent(); /// Update the text which is shown - void updateText(const QString & msg); + void updateText(const TQString & msg); public slots: void contextMenuAboutToShow(); @@ -80,10 +80,10 @@ private slots: private: - const QPixmap & pix; - QTimer hover_timer; - QTimer show_timer; - QLabel* text; + const TQPixmap & pix; + TQTimer hover_timer; + TQTimer show_timer; + TQLabel* text; bool context_menu_shown; bool cursor_over_icon; }; diff --git a/src/trayicon.cpp b/src/trayicon.cpp index 5517def..4422bf0 100644 --- a/src/trayicon.cpp +++ b/src/trayicon.cpp @@ -47,9 +47,9 @@ #include <klocale.h> #include <kapplication.h> #include "trayicon.h" -#include <qtooltip.h> +#include <ntqtooltip.h> #include <kpassivepopup.h> -#include <qstringlist.h> +#include <ntqstringlist.h> #include "trayhoverpopup.h" #include "torkconfig.h" @@ -59,7 +59,7 @@ TrayIcon::TrayIcon( tork *parent, const char *name) { m_kt_pix = loadIcon("tork"); setPixmap(m_kt_pix); - paint=new QPainter( this ); + paint=new TQPainter( this ); drawContents ( paint ); m_parent = parent; @@ -75,15 +75,15 @@ TrayIcon::TrayIcon( tork *parent, const char *name) TrayIcon::~TrayIcon() {} -void TrayIcon::dragEnterEvent(QDragEnterEvent *e) +void TrayIcon::dragEnterEvent(TQDragEnterEvent *e) { e->accept (KURLDrag::canDecode(e)); } -void TrayIcon::dropEvent (QDropEvent *o) +void TrayIcon::dropEvent (TQDropEvent *o) { KURL::List list; - QString text; + TQString text; if ( KURLDrag::decode( o, list ) ) droppedfile(list); } @@ -98,34 +98,34 @@ void TrayIcon::droppedfile (KURL::List url) } -void TrayIcon::enterEvent(QEvent* ev) +void TrayIcon::enterEvent(TQEvent* ev) { KSystemTray::enterEvent(ev); m_hover_popup->enterEvent(); } -void TrayIcon::leaveEvent(QEvent* ) +void TrayIcon::leaveEvent(TQEvent* ) { m_hover_popup->leaveEvent(); } -void TrayIcon::updateStats(const QString & downloadBandwidthHist, - const QString & uploadBandwidthHist, - const QString & downloadBandwidth, const QString & uploadBandwidth, - const QStringList & serverReport, const QStringList & clientReport, - const QString & curBandwidthRate) +void TrayIcon::updateStats(const TQString & downloadBandwidthHist, + const TQString & uploadBandwidthHist, + const TQString & downloadBandwidth, const TQString & uploadBandwidth, + const TQStringList & serverReport, const TQStringList & clientReport, + const TQString & curBandwidthRate) { - QString serverStatus; - for ( QStringList::ConstIterator it = serverReport.begin(); it != serverReport.end(); ++it ) + TQString serverStatus; + for ( TQStringList::ConstIterator it = serverReport.begin(); it != serverReport.end(); ++it ) { if ((*it).isEmpty()) continue; if ((it) != serverReport.begin()) - serverStatus.append(QString("<tr><td></td><td colspan='2'>%1</td></tr>").arg((*it))); + serverStatus.append(TQString("<tr><td></td><td colspan='2'>%1</td></tr>").arg((*it))); } - QString tip = i18n("<table cellpadding='2' cellspacing='2'align='center'>" + TQString tip = i18n("<table cellpadding='2' cellspacing='2'align='center'>" "<tr>" "<td><b>Client:</b></td>" "<td colspan='2'>%1</td>" @@ -202,7 +202,7 @@ void SetMaxRate::makeMenu() for (int i = 0; i < 15; i++) { - QValueList<int> valuePair; + TQValueList<int> valuePair; if (delta == 0) valuePair.append(maxBandwidth); else @@ -225,10 +225,10 @@ void SetMaxRate::makeMenu() { if(m_rate == valuePair[j] && j==0) { - setItemChecked(insertItem(QString("%1 KB/s").arg(valuePair[j]),-1, (j == 0) ? 2 : (int)count()), true); + setItemChecked(insertItem(TQString("%1 KB/s").arg(valuePair[j]),-1, (j == 0) ? 2 : (int)count()), true); } else - insertItem(QString("%1 KB/s").arg(valuePair[j]),-1, (j == 0) ? 2 : (int)count()); + insertItem(TQString("%1 KB/s").arg(valuePair[j]),-1, (j == 0) ? 2 : (int)count()); } } @@ -249,8 +249,8 @@ void SetMaxRate::rateSelected(int id) // kdDebug() << text(id) << endl; // kdDebug() << text(id).toInt() << endl; - //QT Bug: The value referenced by the QPopUpMenu ID often has an ampersand - QString textID = text(id); + //QT Bug: The value referenced by the TQPopUpMenu ID often has an ampersand + TQString textID = text(id); textID.replace("&",""); textID.replace(" KB/s",""); diff --git a/src/trayicon.h b/src/trayicon.h index b5ffc88..977a6ce 100644 --- a/src/trayicon.h +++ b/src/trayicon.h @@ -44,12 +44,12 @@ #include <ksystemtray.h> #include <kpopupmenu.h> -#include <qpainter.h> +#include <ntqpainter.h> #include <kurl.h> #include <tork.h> -class QString; +class TQString; class TrayHoverPopup; class tork; @@ -65,20 +65,20 @@ public: virtual ~TrayIcon(); /// Update stats for system tray icon - void updateStats(const QString &, const QString &, - const QString &,const QString &, const QStringList &, const QStringList &, - const QString &); + void updateStats(const TQString &, const TQString &, + const TQString &,const TQString &, const TQStringList &, const TQStringList &, + const TQString &); private: - virtual void enterEvent(QEvent* ev); - virtual void leaveEvent(QEvent* ev); - virtual void dragEnterEvent(QDragEnterEvent *e); - virtual void dropEvent (QDropEvent *o); + virtual void enterEvent(TQEvent* ev); + virtual void leaveEvent(TQEvent* ev); + virtual void dragEnterEvent(TQDragEnterEvent *e); + virtual void dropEvent (TQDropEvent *o); void droppedfile (KURL::List url); private: - QPainter *paint; + TQPainter *paint; TrayHoverPopup* m_hover_popup; - QPixmap m_kt_pix; + TQPixmap m_kt_pix; tork *m_parent; }; diff --git a/src/update.cpp b/src/update.cpp index 0785526..d406ac4 100644 --- a/src/update.cpp +++ b/src/update.cpp @@ -29,11 +29,11 @@ #include <kaction.h> -#include <qcheckbox.h> +#include <ntqcheckbox.h> #include <kbuttonbox.h> #include <kurlcompletion.h> #include <kcombobox.h> -#include <qlayout.h> +#include <ntqlayout.h> #include <kmessagebox.h> #include <klineedit.h> #include <ktempfile.h> @@ -47,8 +47,8 @@ #include <dcopclient.h> #include <kuser.h> -#include <qtimer.h> -#include <qdir.h> +#include <ntqtimer.h> +#include <ntqdir.h> #include "version.h" #include <stdlib.h> @@ -74,8 +74,8 @@ const char *mirrors[] = { 0 }; -TorkUpdate::TorkUpdate(QWidget *parent, const char *name) - : QWidget(parent, name),filelist(new KHTMLPart(this)) +TorkUpdate::TorkUpdate(TQWidget *parent, const char *name) + : TQWidget(parent, name),filelist(new KHTMLPart(this)) { } @@ -86,25 +86,25 @@ TorkUpdate::~TorkUpdate() } -void TorkUpdate::downloadComponent(QString component, QString version, QString extension) +void TorkUpdate::downloadComponent(TQString component, TQString version, TQString extension) { upgradeinprogress = true; - QString location = getenv("HOME"); + TQString location = getenv("HOME"); location += "/.tork"; - QDir torkdir(location); + TQDir torkdir(location); if (!torkdir.exists() && !torkdir.mkdir(location)) location = getenv("HOME"); - QString currenttor = location + QString("/%1-%2").arg(component).arg(version); - QDir tordir(currenttor); + TQString currenttor = location + TQString("/%1-%2").arg(component).arg(version); + TQDir tordir(currenttor); - QString configure; - configure = QString("%1/%2-%3/configure").arg(location).arg(component).arg(version); + TQString configure; + configure = TQString("%1/%2-%3/configure").arg(location).arg(component).arg(version); - QFile configurefile(configure); + TQFile configurefile(configure); bool download = true; @@ -119,28 +119,28 @@ void TorkUpdate::downloadComponent(QString component, QString version, QString e } } - QStringList entry; + TQStringList entry; while (download){ startProgressDialog( i18n( "Downloading %1-%2..." ).arg(component).arg(version) ); - QString dlLocation; - QString dlLocationSig; + TQString dlLocation; + TQString dlLocationSig; if (component == "tor"){ - dlLocation = QString("https://torproject.org/dist/%3").arg(highestsofarfilename); - dlLocationSig = QString("https://torproject.org/dist/%3.asc").arg(highestsofarfilename); + dlLocation = TQString("https://torproject.org/dist/%3").arg(highestsofarfilename); + dlLocationSig = TQString("https://torproject.org/dist/%3.asc").arg(highestsofarfilename); }else if (component == "privoxy") - dlLocation = QString("http://%1.dl.sourceforge.net/sourceforge%3").arg(getMirror()).arg(highestsofarfilename); + dlLocation = TQString("http://%1.dl.sourceforge.net/sourceforge%3").arg(getMirror()).arg(highestsofarfilename); else if (component == "dante") - dlLocation = QString("http://www.mirrors.wiretapped.net/security/firewalls/dante/%3").arg(highestsofarfilename); + dlLocation = TQString("http://www.mirrors.wiretapped.net/security/firewalls/dante/%3").arg(highestsofarfilename); else if (component == "thttpd") - dlLocation = QString("http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz"); + dlLocation = TQString("http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz"); else if (component == "Mixminion") - dlLocation = QString("http://www.mixminion.net/dist/0.0.8alpha3/Mixminion-0.0.8alpha3.tar.gz"); + dlLocation = TQString("http://www.mixminion.net/dist/0.0.8alpha3/Mixminion-0.0.8alpha3.tar.gz"); else - dlLocation = QString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension); + dlLocation = TQString("http://%1.dl.sourceforge.net/sourceforge/%2/%3-%4%5").arg(getMirror()).arg(component).arg(component).arg(version).arg(extension); - QString tmpFile; + TQString tmpFile; if ( !KIO::NetAccess::download( dlLocation, tmpFile, 0L ) ){ KMessageBox::information (0,i18n("Couldn't download %1.").arg(component)); delete timer; @@ -151,7 +151,7 @@ void TorkUpdate::downloadComponent(QString component, QString version, QString e return; } - QString tmpFile2; + TQString tmpFile2; if (!dlLocationSig.isEmpty()){ if ( !KIO::NetAccess::download( dlLocationSig, tmpFile2, 0L ) ){ KMessageBox::information (0,i18n("Couldn't download %1 signature file.").arg(component)); @@ -234,12 +234,12 @@ void TorkUpdate::downloadComponent(QString component, QString version, QString e //KTar does not honour executable permissions if (component == "privoxy"){ - configure = QString("%1/%2/").arg(location).arg(entry.first()); + configure = TQString("%1/%2/").arg(location).arg(entry.first()); configurefile.setName(configure+"configure.in"); } if (component == "Mixminion"){ - configure = QString("%1/%2/").arg(location).arg(entry.first()); + configure = TQString("%1/%2/").arg(location).arg(entry.first()); configurefile.setName(configure+"README"); } @@ -259,18 +259,18 @@ void TorkUpdate::downloadComponent(QString component, QString version, QString e KProcess* arkollonproc = new KShellProcess(); KMessageBox::information (this,i18n( "<p><b>If this the first time you've compiled software then here are a few useful tips:</b><br>" - "1. Any error messages in the log file with the words 'KDE', 'Qt','curl' or 'X' in them mean that you need to install " + "1. Any error messages in the log file with the words 'KDE', 'TQt','curl' or 'X' in them mean that you need to install " "the appropriate development libraries.<br>" "2. Any package provided by your distribution with 'lib' or 'devel' in the name is a development library, e.g. qt-devel, libkde.<br>" "</p>" ),"Compilation Tips","compiler"); - QString command; + TQString command; if (component == "Mixminion") - command = QString("kdesu -i tork -c 'xterm -hold -e \"cd %1;make install;printf \\\"If there were errors try downloading and installing Mixminion from the Mixminion homepage. If the installation looks successful try sending an anonymous mail to yourself. Close the window to continue.\\\"\"'").arg(configure); + command = TQString("kdesu -i tork -c 'xterm -hold -e \"cd %1;make install;printf \\\"If there were errors try downloading and installing Mixminion from the Mixminion homepage. If the installation looks successful try sending an anonymous mail to yourself. Close the window to continue.\\\"\"'").arg(configure); else if (component == "privoxy") - command = QString("cd %1; autoheader;autoconf;torkarkollon %2").arg(configure).arg(configure); + command = TQString("cd %1; autoheader;autoconf;torkarkollon %2").arg(configure).arg(configure); else - command = QString("torkarkollon %1/%2-%3").arg(location).arg(component).arg(version); + command = TQString("torkarkollon %1/%2-%3").arg(location).arg(component).arg(version); *arkollonproc << command; @@ -357,7 +357,7 @@ void TorkUpdate::checkForNewDanteDirectly() } -void TorkUpdate::completedSearchForUpdates(const QString &component, const QString &extension) +void TorkUpdate::completedSearchForUpdates(const TQString &component, const TQString &extension) { double currentversion; @@ -396,11 +396,11 @@ void TorkUpdate::completedSearchForUpdates(const QString &component, const QStri -void TorkUpdate::startProgressDialog( const QString & text ) +void TorkUpdate::startProgressDialog( const TQString & text ) { - progressDialog = new KProgressDialog( 0, "progress_dialog", QString::null, text, false ); + progressDialog = new KProgressDialog( 0, "progress_dialog", TQString::null, text, false ); progressDialog->setAllowCancel( true ); progressDialog->showCancelButton( true ); @@ -415,7 +415,7 @@ void TorkUpdate::startProgressDialog( const QString & text ) connect( progressDialog, SIGNAL( cancelClicked() ), this, SLOT( updateCanceled() ) ); - timer = new QTimer( this ); + timer = new TQTimer( this ); connect( timer, SIGNAL( timeout() ), this, SLOT( slotProg() ) ); timer->start( 200, FALSE ); @@ -576,7 +576,7 @@ void TorkUpdate::parseSFPageHack() void TorkUpdate::getVersionFromLink( const DOM::Node &n ) { double numericversion; - QString tmpversion; + TQString tmpversion; if ( n.isNull() || n.nodeType() != DOM::Node::ELEMENT_NODE ) return; @@ -585,14 +585,14 @@ void TorkUpdate::getVersionFromLink( const DOM::Node &n ) KURL href ( elem.getAttribute( "href" ).string() ); - QString name = elem.getAttribute( "href" ).string(); - QString version = name.replace(".tar.bz2","").replace(".tar.gz",""); + TQString name = elem.getAttribute( "href" ).string(); + TQString version = name.replace(".tar.bz2","").replace(".tar.gz",""); version = version.replace("tork-","").replace("tor-","") .replace("/ijbswa/privoxy-","") .replace("-stable-src","") .replace("dante-",""); - QString rawversion = version; + TQString rawversion = version; if (m_alpha) { version.remove("-alpha").remove("-beta").remove("-rc"); } @@ -607,7 +607,7 @@ void TorkUpdate::getVersionFromLink( const DOM::Node &n ) } -QString TorkUpdate::getMirror() +TQString TorkUpdate::getMirror() { int r = 1+(int) (16.0*rand()/(RAND_MAX+1.0)); static int previousmirror = 0; @@ -620,11 +620,11 @@ QString TorkUpdate::getMirror() return mirrors[r]; } -double TorkUpdate::numericizeVersion(QString &version) +double TorkUpdate::numericizeVersion(TQString &version) { - QString tmpversion = version; - QStringList tokens = QStringList::split(".",tmpversion); - for ( QStringList::Iterator it = tokens.begin(); it != tokens.end(); it++ ) + TQString tmpversion = version; + TQStringList tokens = TQStringList::split(".",tmpversion); + for ( TQStringList::Iterator it = tokens.begin(); it != tokens.end(); it++ ) { if ((*it).length() < 2) (*it).prepend("0"); diff --git a/src/update.h b/src/update.h index 1b3f35f..857f472 100644 --- a/src/update.h +++ b/src/update.h @@ -56,13 +56,13 @@ class KHTMLPart; * @author $AUTHOR <$EMAIL> * @version $APP_VERSION */ -class TorkUpdate : public QWidget +class TorkUpdate : public TQWidget { Q_OBJECT public: - TorkUpdate(QWidget *parent, const char *name=0); + TorkUpdate(TQWidget *parent, const char *name=0); /** * Default Destructor @@ -90,29 +90,29 @@ private slots: private: void getLatestVersionFromSF(KURL url); void getLatestVersionFromSFHack(KURL url); - void downloadComponent(QString component, QString version, QString extension); - void startProgressDialog( const QString & text ); + void downloadComponent(TQString component, TQString version, TQString extension); + void startProgressDialog( const TQString & text ); void checkInternet(); void connectToHost(); void checkForNewTork(); void getVersionFromLink( const DOM::Node &n ); - void completedSearchForUpdates(const QString &component, const QString &extension); - double numericizeVersion(QString &version); - QString getMirror(); + void completedSearchForUpdates(const TQString &component, const TQString &extension); + double numericizeVersion(TQString &version); + TQString getMirror(); KProcess *childproc; KProcIO *versionproc; - QString tempFileName; - QString errorMessage; - QString pidFileName; + TQString tempFileName; + TQString errorMessage; + TQString pidFileName; KProgressDialog *progressDialog; - QTimer *timer; + TQTimer *timer; bool upgradeinprogress; bool checkingDirectly; double highestsofarnumeric; - QString highestsofarraw; - QString highestsofarfilename; + TQString highestsofarraw; + TQString highestsofarfilename; KResolver m_resolver; - QString currentTorVersion; + TQString currentTorVersion; bool m_alpha; KHTMLPart *filelist; private: diff --git a/src/upnp/exitoperation.h b/src/upnp/exitoperation.h index edaa2fa..4a27911 100644 --- a/src/upnp/exitoperation.h +++ b/src/upnp/exitoperation.h @@ -20,7 +20,7 @@ #ifndef KTEXITOPERATION_H #define KTEXITOPERATION_H -#include <qobject.h> +#include <ntqobject.h> #include <kio/job.h> namespace kt @@ -35,7 +35,7 @@ namespace kt * ExitOperation's can be used in combination with a WaitJob, to wait for a certain amount of time * to give serveral ExitOperation's the time time to finish up. */ - class ExitOperation : public QObject + class ExitOperation : public TQObject { Q_OBJECT public: diff --git a/src/upnp/forwardportlist.h b/src/upnp/forwardportlist.h index 2a27f59..5f8f9f7 100644 --- a/src/upnp/forwardportlist.h +++ b/src/upnp/forwardportlist.h @@ -20,7 +20,7 @@ #ifndef FORWARDPORTLIST_H #define FORWARDPORTLIST_H -#include <qvaluelist.h> +#include <ntqvaluelist.h> #include "../constants.h" #include "portlist.h" @@ -67,7 +67,7 @@ namespace net * List of ports which are currently being used. * */ - class ForwardPortList : public QValueList<ForwardPort> + class ForwardPortList : public TQValueList<ForwardPort> { ForwardPortListener* lst; public: diff --git a/src/upnp/httprequest.cpp b/src/upnp/httprequest.cpp index 5a612b0..bb411ca 100644 --- a/src/upnp/httprequest.cpp +++ b/src/upnp/httprequest.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qstringlist.h> +#include <ntqstringlist.h> #include "httprequest.h" #include "../functions.h" #include <kdebug.h> @@ -27,10 +27,10 @@ namespace bt { - HTTPRequest::HTTPRequest(const QString & hdr,const QString & payload,const QString & host,Uint16 port,bool verbose, bool fwd) : hdr(hdr),payload(payload),verbose(verbose),fwd(fwd) + HTTPRequest::HTTPRequest(const TQString & hdr,const TQString & payload,const TQString & host,Uint16 port,bool verbose, bool fwd) : hdr(hdr),payload(payload),verbose(verbose),fwd(fwd) { KSocks::self()->disableSocks(); - sock = new KNetwork::KStreamSocket(host,QString::number(port),this,0); + sock = new KNetwork::KStreamSocket(host,TQString::number(port),this,0); sock->enableRead(true); sock->enableWrite(true); sock->setTimeout(30000); @@ -57,9 +57,9 @@ namespace bt void HTTPRequest::onConnect(const KResolverEntry&) { payload = payload.replace("$LOCAL_IP",sock->localAddress().nodeName()); - hdr = hdr.replace("$CONTENT_LENGTH",QString::number(payload.length())); + hdr = hdr.replace("$CONTENT_LENGTH",TQString::number(payload.length())); - QString req = hdr + payload; + TQString req = hdr + payload; /* if (verbose) { KdDebug() << "Sending " << endl; @@ -80,8 +80,8 @@ namespace bt Array<char> data(ba); ba = sock->readBlock(data,ba); - QString strdata((const char*)data); - QStringList sl = QStringList::split("\r\n",strdata,false); + TQString strdata((const char*)data); + TQStringList sl = TQStringList::split("\r\n",strdata,false); /* if (verbose) { diff --git a/src/upnp/httprequest.h b/src/upnp/httprequest.h index 9832da8..8c4496b 100644 --- a/src/upnp/httprequest.h +++ b/src/upnp/httprequest.h @@ -20,7 +20,7 @@ #ifndef BTHTTPREQUEST_H #define BTHTTPREQUEST_H -#include <qobject.h> +#include <ntqobject.h> #include <kurl.h> #include <kstreamsocket.h> #include "exitoperation.h" @@ -50,7 +50,7 @@ namespace bt * @param port THe port * @param verbose Print traffic to the log */ - HTTPRequest(const QString & hdr,const QString & payload,const QString & host, + HTTPRequest(const TQString & hdr,const TQString & payload,const TQString & host, Uint16 port,bool verbose, bool fwd); virtual ~HTTPRequest(); @@ -58,21 +58,21 @@ namespace bt * Open a connetion and send the request. */ void start(); - QString showPayload(){return payload;}; + TQString showPayload(){return payload;}; signals: /** * An OK reply was sent. * @param r The sender of the request * @param data The data of the reply */ - void replyOK(bt::HTTPRequest* r,const QString & data, bool fwd); + void replyOK(bt::HTTPRequest* r,const TQString & data, bool fwd); /** * Anything else but an 200 OK was sent. * @param r The sender of the request * @param data The data of the reply */ - void replyError(bt::HTTPRequest* r,const QString & data, bool fwd); + void replyError(bt::HTTPRequest* r,const TQString & data, bool fwd); /** * No reply was sent and an error or timeout occurred. @@ -89,7 +89,7 @@ namespace bt private: KNetwork::KStreamSocket* sock; - QString hdr,payload; + TQString hdr,payload; bool verbose,fwd; }; diff --git a/src/upnp/portlist.h b/src/upnp/portlist.h index 5063b78..378127e 100644 --- a/src/upnp/portlist.h +++ b/src/upnp/portlist.h @@ -20,7 +20,7 @@ #ifndef NETPORTLIST_H #define NETPORTLIST_H -#include <qvaluelist.h> +#include <ntqvaluelist.h> #include "../constants.h" namespace net @@ -69,7 +69,7 @@ namespace net * List of ports which are currently being used. * */ - class PortList : public QValueList<Port> + class PortList : public TQValueList<Port> { PortListener* lst; public: diff --git a/src/upnp/soap.cpp b/src/upnp/soap.cpp index b155b55..c44ab1e 100644 --- a/src/upnp/soap.cpp +++ b/src/upnp/soap.cpp @@ -22,9 +22,9 @@ namespace kt { - QString SOAP::createCommand(const QString & action,const QString & service) + TQString SOAP::createCommand(const TQString & action,const TQString & service) { - QString comm = QString("<?xml version=\"1.0\"?>\r\n" + TQString comm = TQString("<?xml version=\"1.0\"?>\r\n" "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">" "<SOAP-ENV:Body>" "<m:%1 xmlns:m=\"%2\"/>" @@ -34,20 +34,20 @@ namespace kt return comm; } - QString SOAP::createCommand(const QString & action,const QString & service,const QValueList<Arg> & args) + TQString SOAP::createCommand(const TQString & action,const TQString & service,const TQValueList<Arg> & args) { - QString comm = QString("<?xml version=\"1.0\"?>\r\n" + TQString comm = TQString("<?xml version=\"1.0\"?>\r\n" "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\">" "<SOAP-ENV:Body>" "<m:%1 xmlns:m=\"%2\">").arg(action).arg(service); - for (QValueList<Arg>::const_iterator i = args.begin();i != args.end();i++) + for (TQValueList<Arg>::const_iterator i = args.begin();i != args.end();i++) { const Arg & a = *i; comm += "<" + a.element + ">" + a.value + "</" + a.element + ">"; } - comm += QString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").arg(action); + comm += TQString("</m:%1></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n").arg(action); return comm; } } diff --git a/src/upnp/soap.h b/src/upnp/soap.h index c11e2ed..cb766f0 100644 --- a/src/upnp/soap.h +++ b/src/upnp/soap.h @@ -20,8 +20,8 @@ #ifndef KTSOAP_H #define KTSOAP_H -#include <qvaluelist.h> -#include <qstring.h> +#include <ntqvaluelist.h> +#include <ntqstring.h> namespace kt { @@ -39,12 +39,12 @@ namespace kt * @param service The name of the service * @return The command */ - static QString createCommand(const QString & action,const QString & service); + static TQString createCommand(const TQString & action,const TQString & service); struct Arg { - QString element; - QString value; + TQString element; + TQString value; }; /** @@ -54,7 +54,7 @@ namespace kt * @param args Arguments for command * @return The command */ - static QString createCommand(const QString & action,const QString & service,const QValueList<Arg> & args); + static TQString createCommand(const TQString & action,const TQString & service,const TQValueList<Arg> & args); }; } diff --git a/src/upnp/upnpdescriptionparser.cpp b/src/upnp/upnpdescriptionparser.cpp index f27b6cd..7b40db7 100644 --- a/src/upnp/upnpdescriptionparser.cpp +++ b/src/upnp/upnpdescriptionparser.cpp @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qxml.h> -#include <qvaluestack.h> +#include <ntqxml.h> +#include <ntqvaluestack.h> // #include <util/fileops.h> #include <kdebug.h> // #include <torrent/globals.h> @@ -30,17 +30,17 @@ using namespace bt; namespace kt { - class XMLContentHandler : public QXmlDefaultHandler + class XMLContentHandler : public TQXmlDefaultHandler { enum Status { TOPLEVEL,ROOT,DEVICE,SERVICE,FIELD,OTHER }; - QString tmp; + TQString tmp; UPnPRouter* router; UPnPService curr_service; - QValueStack<Status> status_stack; + TQValueStack<Status> status_stack; public: XMLContentHandler(UPnPRouter* router); virtual ~XMLContentHandler(); @@ -48,13 +48,13 @@ namespace kt bool startDocument(); bool endDocument(); - bool startElement(const QString &, const QString & localName, const QString &, - const QXmlAttributes & atts); - bool endElement(const QString & , const QString & localName, const QString & ); - bool characters(const QString & ch); + bool startElement(const TQString &, const TQString & localName, const TQString &, + const TQXmlAttributes & atts); + bool endElement(const TQString & , const TQString & localName, const TQString & ); + bool characters(const TQString & ch); - bool interestingDeviceField(const QString & name); - bool interestingServiceField(const QString & name); + bool interestingDeviceField(const TQString & name); + bool interestingServiceField(const TQString & name); }; @@ -65,17 +65,17 @@ namespace kt UPnPDescriptionParser::~UPnPDescriptionParser() {} - bool UPnPDescriptionParser::parse(const QString & file,UPnPRouter* router) + bool UPnPDescriptionParser::parse(const TQString & file,UPnPRouter* router) { bool ret = true; { - QFile fptr(file); + TQFile fptr(file); if (!fptr.open(IO_ReadOnly)) return false; - QXmlInputSource input(&fptr); + TQXmlInputSource input(&fptr); XMLContentHandler chandler(router); - QXmlSimpleReader reader; + TQXmlSimpleReader reader; reader.setContentHandler(&chandler); ret = reader.parse(&input,false); @@ -111,21 +111,21 @@ namespace kt return true; } - bool XMLContentHandler::interestingDeviceField(const QString & name) + bool XMLContentHandler::interestingDeviceField(const TQString & name) { return name == "friendlyName" || name == "manufacturer" || name == "modelDescription" || name == "modelName" || name == "modelNumber"; } - bool XMLContentHandler::interestingServiceField(const QString & name) + bool XMLContentHandler::interestingServiceField(const TQString & name) { return name == "serviceType" || name == "serviceId" || name == "SCPDURL" || name == "controlURL" || name == "eventSubURL"; } - bool XMLContentHandler::startElement(const QString &, const QString & localName, const QString &, - const QXmlAttributes & ) + bool XMLContentHandler::startElement(const TQString &, const TQString & localName, const TQString &, + const TQXmlAttributes & ) { tmp = ""; switch (status_stack.top()) @@ -172,7 +172,7 @@ namespace kt return true; } - bool XMLContentHandler::endElement(const QString & , const QString & localName, const QString & ) + bool XMLContentHandler::endElement(const TQString & , const TQString & localName, const TQString & ) { switch (status_stack.top()) { @@ -208,7 +208,7 @@ namespace kt } - bool XMLContentHandler::characters(const QString & ch) + bool XMLContentHandler::characters(const TQString & ch) { if (ch.length() > 0) { diff --git a/src/upnp/upnpdescriptionparser.h b/src/upnp/upnpdescriptionparser.h index 5d4bf1e..2aaacfe 100644 --- a/src/upnp/upnpdescriptionparser.h +++ b/src/upnp/upnpdescriptionparser.h @@ -41,7 +41,7 @@ namespace kt * @param router The router off the xml description * @return true upon success */ - bool parse(const QString & file,UPnPRouter* router); + bool parse(const TQString & file,UPnPRouter* router); }; } diff --git a/src/upnp/upnpmcastsocket.cpp b/src/upnp/upnpmcastsocket.cpp index 48159c2..70853de 100644 --- a/src/upnp/upnpmcastsocket.cpp +++ b/src/upnp/upnpmcastsocket.cpp @@ -27,13 +27,13 @@ #include <netinet/ip.h> #include <arpa/inet.h> #include <netinet/ip.h> -#include <qstringlist.h> +#include <ntqstringlist.h> #include <ksocketdevice.h> #include <ksocketaddress.h> /*#include <util/log.h> #include <torrent/globals.h>*/ -#include <qfile.h> -#include <qtextstream.h> +#include <ntqfile.h> +#include <ntqtextstream.h> #include "upnpmcastsocket.h" @@ -47,14 +47,14 @@ namespace kt UPnPMCastSocket::UPnPMCastSocket(bool verbose) : verbose(verbose) { routers.setAutoDelete(true); - QObject::connect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead())); - QObject::connect(this,SIGNAL(gotError(int)),this,SLOT(onError(int))); + TQObject::connect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead())); + TQObject::connect(this,SIGNAL(gotError(int)),this,SLOT(onError(int))); setAddressReuseable(true); setFamily(KNetwork::KResolver::IPv4Family); setBlocking(true); for (Uint32 i = 0;i < 10;i++) { - if (!bind(QString::null,QString::number(1900 + i))) + if (!bind(TQString::null,TQString::number(1900 + i))) kdDebug() << "Cannot bind to UDP port 1900" << endl; else break; @@ -67,8 +67,8 @@ namespace kt UPnPMCastSocket::~UPnPMCastSocket() { leaveUPnPMCastGroup(); - QObject::disconnect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead())); - QObject::disconnect(this,SIGNAL(gotError(int)),this,SLOT(onError(int))); + TQObject::disconnect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead())); + TQObject::disconnect(this,SIGNAL(gotError(int)),this,SLOT(onError(int))); } void UPnPMCastSocket::discover() @@ -135,14 +135,14 @@ namespace kt if (verbose) { kdDebug() << "Received : " << endl; - kdDebug() << QString(p.data()) << endl; + kdDebug() << TQString(p.data()) << endl; } // try to make a router of it UPnPRouter* r = parseResponse(p.data()); if (r) { - QObject::connect(r,SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )), + TQObject::connect(r,SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )), this,SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); // download it's xml file @@ -150,10 +150,10 @@ namespace kt } } - UPnPRouter* UPnPMCastSocket::parseResponse(const QByteArray & arr) + UPnPRouter* UPnPMCastSocket::parseResponse(const TQByteArray & arr) { - QStringList lines = QStringList::split("\r\n",QString(arr),false); - QString server; + TQStringList lines = TQStringList::split("\r\n",TQString(arr),false); + TQString server; KURL location; @@ -163,7 +163,7 @@ namespace kt // first read first line and see if contains a HTTP 200 OK message - QString line = lines.first(); + TQString line = lines.first(); if (!line.contains("HTTP")) { // it is either a 200 OK or a NOTIFY @@ -225,9 +225,9 @@ namespace kt kdDebug() << "UPnPMCastSocket Error : " << errorString() << endl; } - void UPnPMCastSocket::saveRouters(const QString & file) + void UPnPMCastSocket::saveRouters(const TQString & file) { - QFile fptr(file); + TQFile fptr(file); if (!fptr.open(IO_WriteOnly)) { kdDebug() << "Cannot open file " << file << " : " << fptr.errorString() << endl; @@ -236,8 +236,8 @@ namespace kt // file format is simple : 2 lines per router, // one containing the server, the other the location - QTextStream fout(&fptr); - bt::PtrMap<QString,UPnPRouter>::iterator i = routers.begin(); + TQTextStream fout(&fptr); + bt::PtrMap<TQString,UPnPRouter>::iterator i = routers.begin(); while (i != routers.end()) { UPnPRouter* r = i->second; @@ -247,9 +247,9 @@ namespace kt } } - void UPnPMCastSocket::loadRouters(const QString & file) + void UPnPMCastSocket::loadRouters(const TQString & file) { - QFile fptr(file); + TQFile fptr(file); if (!fptr.open(IO_ReadOnly)) { kdDebug() << "Cannot open file " << file << " : " << fptr.errorString() << endl; @@ -258,18 +258,18 @@ namespace kt // file format is simple : 2 lines per router, // one containing the server, the other the location - QTextStream fin(&fptr); + TQTextStream fin(&fptr); while (!fin.atEnd()) { - QString server, location; + TQString server, location; server = fin.readLine(); location = fin.readLine(); if (!routers.contains(server)) { UPnPRouter* r = new UPnPRouter(server,location); // download it's xml file - QObject::connect(r,SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); + TQObject::connect(r,SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); r->downloadXMLFile(); } } diff --git a/src/upnp/upnpmcastsocket.h b/src/upnp/upnpmcastsocket.h index be75f4b..23007fe 100644 --- a/src/upnp/upnpmcastsocket.h +++ b/src/upnp/upnpmcastsocket.h @@ -48,13 +48,13 @@ namespace kt Uint32 getNumDevicesDiscovered() const {return routers.count();} /// Find a router using it's server name - UPnPRouter* findDevice(const QString & name) {return routers.find(name);} + UPnPRouter* findDevice(const TQString & name) {return routers.find(name);} /// Save all routers to a file (for convenience at startup) - void saveRouters(const QString & file); + void saveRouters(const TQString & file); /// Load all routers from a file - void loadRouters(const QString & file); + void loadRouters(const TQString & file); public slots: /** @@ -76,14 +76,14 @@ namespace kt void discovered(kt::UPnPRouter* router); public: - UPnPRouter* parseResponse(const QByteArray & arr); + UPnPRouter* parseResponse(const TQByteArray & arr); private: void joinUPnPMCastGroup(); void leaveUPnPMCastGroup(); private: - bt::PtrMap<QString,UPnPRouter> routers; + bt::PtrMap<TQString,UPnPRouter> routers; bool verbose; }; } diff --git a/src/upnp/upnprouter.cpp b/src/upnp/upnprouter.cpp index 4d8f5ad..8e39f33 100644 --- a/src/upnp/upnprouter.cpp +++ b/src/upnp/upnprouter.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <qstringlist.h> +#include <ntqstringlist.h> #include <kio/netaccess.h> #include <kio/job.h> #include "httprequest.h" @@ -31,8 +31,8 @@ #include "soap.h" #include "../functions.h" #include <fcntl.h> -#include <qdir.h> -#include <qfile.h> +#include <ntqdir.h> +#include <ntqfile.h> using namespace bt; using namespace net; @@ -52,7 +52,7 @@ namespace kt this->scpdurl = s.scpdurl; } - void UPnPService::setProperty(const QString & name,const QString & value) + void UPnPService::setProperty(const TQString & name,const TQString & value) { if (name == "serviceType") servicetype = value; @@ -92,7 +92,7 @@ namespace kt /////////////////////////////////////// - void UPnPDeviceDescription::setProperty(const QString & name,const QString & value) + void UPnPDeviceDescription::setProperty(const TQString & name,const TQString & value) { if (name == "friendlyName") friendlyName = value; @@ -108,17 +108,17 @@ namespace kt /////////////////////////////////////// - UPnPRouter::UPnPRouter(const QString & server,const KURL & location,bool verbose) : server(server),location(location),verbose(verbose) + UPnPRouter::UPnPRouter(const TQString & server,const KURL & location,bool verbose) : server(server),location(location),verbose(verbose) { forwardedPortList = new ForwardPortList(); // make the tmp_file unique, current time * a random number should be enough - tmp_file = QString("/tmp/tork_upnp_description-%1.xml").arg(bt::GetCurrentTime() * rand()); + tmp_file = TQString("/tmp/tork_upnp_description-%1.xml").arg(bt::GetCurrentTime() * rand()); } UPnPRouter::~UPnPRouter() { - QValueList<HTTPRequest*>::iterator i = active_reqs.begin(); + TQValueList<HTTPRequest*>::iterator i = active_reqs.begin(); while (i != active_reqs.end()) { (*i)->deleteLater(); @@ -128,7 +128,7 @@ namespace kt void UPnPRouter::addService(const UPnPService & s) { - QValueList<UPnPService>::iterator i = services.begin(); + TQValueList<UPnPService>::iterator i = services.begin(); while (i != services.end()) { UPnPService & os = *i; @@ -147,14 +147,14 @@ namespace kt return; } - QString target = tmp_file; + TQString target = tmp_file; // load in the file (target is always local) UPnPDescriptionParser desc_parse; bool ret = desc_parse.parse(target,this); if (!ret) { kdDebug() << "Error parsing router description !" << endl; - QString dest = KGlobal::dirs()->saveLocation("data","tork") + "upnp_failure"; + TQString dest = KGlobal::dirs()->saveLocation("data","tork") + "upnp_failure"; KIO::file_copy(target,dest,-1,true,false,false); } else @@ -163,7 +163,7 @@ namespace kt debugPrintData(); } xmlFileDownloaded(this,ret); - remove(QFile::encodeName(target)); + remove(TQFile::encodeName(target)); } void UPnPRouter::downloadXMLFile() @@ -181,7 +181,7 @@ namespace kt kdDebug() << "Model description = " << desc.modelDescription << endl; kdDebug() << "Model name = " << desc.modelName << endl; kdDebug() << "Model number = " << desc.modelNumber << endl; - for (QValueList<UPnPService>::iterator i = services.begin();i != services.end();i++) + for (TQValueList<UPnPService>::iterator i = services.begin();i != services.end();i++) { UPnPService & s = *i; kdDebug() << "Service : " << endl; @@ -198,14 +198,14 @@ namespace kt // add all the arguments for the command - QValueList<SOAP::Arg> args; + TQValueList<SOAP::Arg> args; SOAP::Arg a; a.element = "NewRemoteHost"; args.append(a); // the external port a.element = "NewExternalPort"; - a.value = QString::number(externalport.number); + a.value = TQString::number(externalport.number); args.append(a); // the protocol @@ -216,9 +216,9 @@ namespace kt // the local port a.element = "NewInternalPort"; if (internalport.number) - a.value = QString::number(internalport.number); + a.value = TQString::number(internalport.number); else - a.value = QString::number(externalport.number); + a.value = TQString::number(externalport.number); args.append(a); // the local IP address @@ -232,19 +232,19 @@ namespace kt a.element = "NewPortMappingDescription"; static Uint32 cnt = 0; - a.value = QString("TorK UPNP %1").arg(cnt++); // TODO: change this + a.value = TQString("TorK UPNP %1").arg(cnt++); // TODO: change this args.append(a); a.element = "NewLeaseDuration"; a.value = "0"; args.append(a); - QString action = "AddPortMapping"; - QString comm = SOAP::createCommand(action,srv->servicetype,args); + TQString action = "AddPortMapping"; + TQString comm = SOAP::createCommand(action,srv->servicetype,args); Forwarding fw = {externalport,internalport,0,srv}; // erase old forwarding if one exists - QValueList<Forwarding>::iterator itr = fwds.begin(); + TQValueList<Forwarding>::iterator itr = fwds.begin(); while (itr != fwds.end()) { Forwarding & fwo = *itr; @@ -260,7 +260,7 @@ namespace kt //Track the forwarding request so we can know whether it was successful or not //and keep a map of successfully forwarded ports in forwardedPorts ForwardingRequest fwreq = {externalport,internalport,fw.pending_req}; - QValueList<ForwardingRequest>::iterator itrq = fwdreqs.begin(); + TQValueList<ForwardingRequest>::iterator itrq = fwdreqs.begin(); while (itrq != fwdreqs.end()) { ForwardingRequest & fwo = *itrq; @@ -286,7 +286,7 @@ namespace kt kdDebug() << "Forwarding port " << externalport.number << " (" << (externalport.proto == UDP ? "UDP" : "TCP") << ")" << endl; // first find the right service - QValueList<UPnPService>::iterator i = services.begin(); + TQValueList<UPnPService>::iterator i = services.begin(); while (i != services.end()) { UPnPService & s = *i; @@ -307,14 +307,14 @@ namespace kt const net::Port & intport,bt::WaitJob* waitjob) { // add all the arguments for the command - QValueList<SOAP::Arg> args; + TQValueList<SOAP::Arg> args; SOAP::Arg a; a.element = "NewRemoteHost"; args.append(a); // the external port a.element = "NewExternalPort"; - a.value = QString::number(extport.number); + a.value = TQString::number(extport.number); args.append(a); // the protocol @@ -323,12 +323,12 @@ namespace kt args.append(a); - QString action = "DeletePortMapping"; - QString comm = SOAP::createCommand(action,srv->servicetype,args); + TQString action = "DeletePortMapping"; + TQString comm = SOAP::createCommand(action,srv->servicetype,args); bt::HTTPRequest* r = sendSoapQuery(comm,srv->servicetype + "#" + action,srv->controlurl,waitjob != 0,false); ForwardingRequest fwreq = {extport,intport,r}; - QValueList<ForwardingRequest>::iterator itrq = fwdreqs.begin(); + TQValueList<ForwardingRequest>::iterator itrq = fwdreqs.begin(); while (itrq != fwdreqs.end()) { ForwardingRequest & fwo = *itrq; @@ -353,7 +353,7 @@ namespace kt kdDebug() << "Undoing forward of port " << externalport.number << " (" << (externalport.proto == UDP ? "UDP" : "TCP") << ")" << endl; - QValueList<Forwarding>::iterator itr = fwds.begin(); + TQValueList<Forwarding>::iterator itr = fwds.begin(); while (itr != fwds.end()) { Forwarding & wd = *itr; @@ -369,14 +369,14 @@ namespace kt } } - bt::HTTPRequest* UPnPRouter::sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl, bool fwd,bool at_exit) + bt::HTTPRequest* UPnPRouter::sendSoapQuery(const TQString & query,const TQString & soapact,const TQString & controlurl, bool fwd,bool at_exit) { // if port is not set, 0 will be returned // thanks to Diego R. Brogna for spotting this bug if (location.port()==0) location.setPort(80); - QString http_hdr = QString( + TQString http_hdr = TQString( "POST %1 HTTP/1.1\r\n" "HOST: %2:%3\r\n" "Content-length: $CONTENT_LENGTH\r\n" @@ -386,10 +386,10 @@ namespace kt HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose, fwd); - connect(r,SIGNAL(replyError(bt::HTTPRequest* ,const QString& ,bool)), - this,SLOT(onReplyError(bt::HTTPRequest* ,const QString& ,bool))); - connect(r,SIGNAL(replyOK(bt::HTTPRequest* ,const QString& ,bool)), - this,SLOT(onReplyOK(bt::HTTPRequest* ,const QString& ,bool))); + connect(r,SIGNAL(replyError(bt::HTTPRequest* ,const TQString& ,bool)), + this,SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ,bool))); + connect(r,SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& ,bool)), + this,SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ,bool))); connect(r,SIGNAL(error(bt::HTTPRequest*, bool )), this,SLOT(onError(bt::HTTPRequest*, bool ))); r->start(); @@ -400,7 +400,7 @@ namespace kt void UPnPRouter::httpRequestDone(bt::HTTPRequest* r,bool erase_fwd) { - QValueList<Forwarding>::iterator i = fwds.begin(); + TQValueList<Forwarding>::iterator i = fwds.begin(); while (i != fwds.end()) { Forwarding & fw = *i; @@ -419,11 +419,11 @@ namespace kt r->deleteLater(); } - void UPnPRouter::onReplyOK(bt::HTTPRequest* r,const QString & s,bool fwd) + void UPnPRouter::onReplyOK(bt::HTTPRequest* r,const TQString & s,bool fwd) { kdDebug() << "UPnPRouter : OK" << endl; kdDebug() << "FWD : " << fwd << endl; - QValueList<ForwardingRequest>::iterator i = fwdreqs.begin(); + TQValueList<ForwardingRequest>::iterator i = fwdreqs.begin(); while (i != fwdreqs.end()) { ForwardingRequest & fw = *i; @@ -444,7 +444,7 @@ namespace kt httpRequestDone(r,false); } - void UPnPRouter::onReplyError(bt::HTTPRequest* r,const QString & s,bool fwd) + void UPnPRouter::onReplyError(bt::HTTPRequest* r,const TQString & s,bool fwd) { if (verbose) kdDebug() << "UPnPRouter : Error" << endl; diff --git a/src/upnp/upnprouter.h b/src/upnp/upnprouter.h index f685620..8ae321e 100644 --- a/src/upnp/upnprouter.h +++ b/src/upnp/upnprouter.h @@ -20,12 +20,12 @@ #ifndef KTUPNPROUTER_H #define KTUPNPROUTER_H -#include <qtimer.h> +#include <ntqtimer.h> #include <kio/job.h> -#include <qvaluelist.h> +#include <ntqvaluelist.h> #include "exitoperation.h" #include <kurl.h> -#include <qstringlist.h> +#include <ntqstringlist.h> #include <kstreamsocket.h> #include "portlist.h" #include "forwardportlist.h" @@ -71,8 +71,8 @@ namespace bt void operationFinished(kt::ExitOperation* op); private: - QTimer timer; - QValueList<kt::ExitOperation*> exit_ops; + TQTimer timer; + TQValueList<kt::ExitOperation*> exit_ops; }; void SynchronousWait(Uint32 millis); @@ -103,11 +103,11 @@ namespace kt */ struct UPnPService { - QString serviceid; - QString servicetype; - QString controlurl; - QString eventsuburl; - QString scpdurl; + TQString serviceid; + TQString servicetype; + TQString controlurl; + TQString eventsuburl; + TQString scpdurl; UPnPService(); UPnPService(const UPnPService & s); @@ -117,7 +117,7 @@ namespace kt * @param name Name of the property (matches to variable names) * @param value Value of the property */ - void setProperty(const QString & name,const QString & value); + void setProperty(const TQString & name,const TQString & value); /** * Set all strings to empty. @@ -140,18 +140,18 @@ namespace kt */ struct UPnPDeviceDescription { - QString friendlyName; - QString manufacturer; - QString modelDescription; - QString modelName; - QString modelNumber; + TQString friendlyName; + TQString manufacturer; + TQString modelDescription; + TQString modelName; + TQString modelNumber; /** * Set a property of the description * @param name Name of the property (matches to variable names) * @param value Value of the property */ - void setProperty(const QString & name,const QString & value); + void setProperty(const TQString & name,const TQString & value); }; /** @@ -160,7 +160,7 @@ namespace kt * Class representing a UPnP enabled router. This class is also used to communicate * with the router. */ - class UPnPRouter : public QObject + class UPnPRouter : public TQObject { Q_OBJECT @@ -181,14 +181,14 @@ namespace kt }; private: - QString server; - QString tmp_file; + TQString server; + TQString tmp_file; KURL location; UPnPDeviceDescription desc; - QValueList<UPnPService> services; - QValueList<Forwarding> fwds; - QValueList<ForwardingRequest> fwdreqs; - QValueList<bt::HTTPRequest*> active_reqs; + TQValueList<UPnPService> services; + TQValueList<Forwarding> fwds; + TQValueList<ForwardingRequest> fwdreqs; + TQValueList<bt::HTTPRequest*> active_reqs; net::ForwardPortList* forwardedPortList; public: @@ -198,11 +198,11 @@ namespace kt * @param location The location of it's xml description file * @param verbose Print lots of debug info */ - UPnPRouter(const QString & server,const KURL & location,bool verbose = false); + UPnPRouter(const TQString & server,const KURL & location,bool verbose = false); virtual ~UPnPRouter(); /// Get the name of the server - QString getServer() const {return server;} + TQString getServer() const {return server;} /// Get the location of it's xml description KURL getLocation() const {return location;} @@ -256,14 +256,14 @@ namespace kt void debugPrintData(); - QValueList<ForwardingRequest>::iterator beginReqMappings() {return fwdreqs.begin();} - QValueList<ForwardingRequest>::iterator endReqMappings() {return fwdreqs.end();} - QValueList<Forwarding>::iterator beginPortMappings() {return fwds.begin();} - QValueList<Forwarding>::iterator endPortMappings() {return fwds.end();} + TQValueList<ForwardingRequest>::iterator beginReqMappings() {return fwdreqs.begin();} + TQValueList<ForwardingRequest>::iterator endReqMappings() {return fwdreqs.end();} + TQValueList<Forwarding>::iterator beginPortMappings() {return fwds.begin();} + TQValueList<Forwarding>::iterator endPortMappings() {return fwds.end();} net::ForwardPortList* forwardedPorts() {return forwardedPortList;} private slots: - void onReplyOK(bt::HTTPRequest* r,const QString &,bool); - void onReplyError(bt::HTTPRequest* r,const QString &,bool); + void onReplyOK(bt::HTTPRequest* r,const TQString &,bool); + void onReplyError(bt::HTTPRequest* r,const TQString &,bool); void onError(bt::HTTPRequest* r,bool); void downloadFinished(KIO::Job* j); @@ -282,13 +282,13 @@ namespace kt */ void xmlFileDownloaded(UPnPRouter* r,bool success); - void replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString &,bool); - void replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString &,bool); + void replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString &,bool); + void replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString &,bool); private: - QValueList<UPnPService>::iterator findPortForwardingService(); + TQValueList<UPnPService>::iterator findPortForwardingService(); - bt::HTTPRequest* sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl,bool fwd, bool at_exit = false ); + bt::HTTPRequest* sendSoapQuery(const TQString & query,const TQString & soapact,const TQString & controlurl,bool fwd, bool at_exit = false ); bool verbose; void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port()); diff --git a/src/upnpmanager.cpp b/src/upnpmanager.cpp index 573fa16..d249c68 100644 --- a/src/upnpmanager.cpp +++ b/src/upnpmanager.cpp @@ -39,8 +39,8 @@ UPnPManager* UPnPManager::manager = 0; return manager; } - UPnPManager::UPnPManager(QWidget* parent, const char* name) - : QWidget(parent, name) + UPnPManager::UPnPManager(TQWidget* parent, const char* name) + : TQWidget(parent, name) { sock = new UPnPMCastSocket(); connect(sock,SIGNAL(discovered( kt::UPnPRouter* )), @@ -80,18 +80,18 @@ UPnPManager* UPnPManager::manager = 0; bool force, bool silent) { m_silent = silent; - QValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin(); + TQValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin(); while (r != discoveredRouters.end()) { - disconnect((*r),SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool )), - this,SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool ))); - disconnect((*r),SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool )), - this,SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool ))); + disconnect((*r),SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )), + this,SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool ))); + disconnect((*r),SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )), + this,SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool ))); - connect((*r),SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool )), - this,SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool ))); - connect((*r),SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool )), - this,SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool ))); + connect((*r),SIGNAL(replyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )), + this,SLOT(onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool ))); + connect((*r),SIGNAL(replyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool )), + this,SLOT(onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool ))); for (net::ForwardPortList::ConstIterator i = forwardPorts.begin(); i != forwardPorts.end();i++) @@ -109,13 +109,13 @@ UPnPManager* UPnPManager::manager = 0; kdDebug() << "Done" << endl; } - void UPnPManager::onReplyError(kt::UPnPRouter* router,bt::HTTPRequest* req,const QString&, bool fwd ) + void UPnPManager::onReplyError(kt::UPnPRouter* router,bt::HTTPRequest* req,const TQString&, bool fwd ) { emit forwardingError(router,req->showPayload(),fwd); } - void UPnPManager::onReplyOK(kt::UPnPRouter* router,bt::HTTPRequest* req,const QString&, bool fwd ) + void UPnPManager::onReplyOK(kt::UPnPRouter* router,bt::HTTPRequest* req,const TQString&, bool fwd ) { kdDebug() << "forwarding OK" << endl; @@ -126,7 +126,7 @@ UPnPManager* UPnPManager::manager = 0; bool silent) { m_silent = silent; - QValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin(); + TQValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin(); while (r != discoveredRouters.end()) { for (net::ForwardPortList::ConstIterator i = forwardPorts.begin();i != forwardPorts.end();i++) @@ -141,10 +141,10 @@ UPnPManager* UPnPManager::manager = 0; kdDebug() << "Done" << endl; } - QStringList UPnPManager::discoveredRoutersNameList() + TQStringList UPnPManager::discoveredRoutersNameList() { - QStringList routers; - QValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin(); + TQStringList routers; + TQValueList<kt::UPnPRouter*>::iterator r = discoveredRouters.begin(); while (r != discoveredRouters.end()) { routers.append((*r)->getDescription().friendlyName); @@ -162,7 +162,7 @@ UPnPManager* UPnPManager::manager = 0; void UPnPManager::unload() { -/* QString routers_file = KGlobal::dirs()->saveLocation("data","tork") + "routers"; +/* TQString routers_file = KGlobal::dirs()->saveLocation("data","tork") + "routers"; sock->saveRouters(routers_file);*/ sock->close(); delete sock; diff --git a/src/upnpmanager.h b/src/upnpmanager.h index 44d1e3c..29dc319 100644 --- a/src/upnpmanager.h +++ b/src/upnpmanager.h @@ -25,8 +25,8 @@ #ifndef UPNPMANAGER_H #define UPNPMANAGER_H -#include <qmap.h> -#include <qwidget.h> +#include <ntqmap.h> +#include <ntqwidget.h> #include "upnp/upnprouter.h" #include "upnp/upnpdescriptionparser.h" #include "upnp/upnpmcastsocket.h" @@ -40,7 +40,7 @@ using namespace net; /** * Widget for the UPnP pref dialog page. */ -class UPnPManager : public QWidget +class UPnPManager : public TQWidget { Q_OBJECT @@ -53,9 +53,9 @@ public: bool silent=false); bool routersDiscovered(){ return ((!discoveredRouters.isEmpty()) ? true : false);}; bool silentUpdate(){ return m_silent;}; - QStringList discoveredRoutersNameList(); + TQStringList discoveredRoutersNameList(); protected: - UPnPManager(QWidget* parent = 0, const char* name = 0); + UPnPManager(TQWidget* parent = 0, const char* name = 0); virtual ~UPnPManager(); private: static UPnPManager* manager; @@ -66,12 +66,12 @@ public slots: * @param r The device */ void discovered(kt::UPnPRouter* r); - void onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool ); - void onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const QString&, bool ); + void onReplyOK(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool ); + void onReplyError(kt::UPnPRouter*,bt::HTTPRequest* ,const TQString&, bool ); signals: void routerDiscovered(kt::UPnPRouter*); - void forwardingError(kt::UPnPRouter*,const QString &, bool ); - void forwardingOK(kt::UPnPRouter*,const QString &, bool ); + void forwardingError(kt::UPnPRouter*,const TQString &, bool ); + void forwardingOK(kt::UPnPRouter*,const TQString &, bool ); private: void load(); @@ -81,7 +81,7 @@ private: kt::UPnPRouter* def_router; kt::UPnPMCastSocket* sock; net::ForwardPortList m_forwardPorts; - QValueList<kt::UPnPRouter*> discoveredRouters; + TQValueList<kt::UPnPRouter*> discoveredRouters; bool m_silent; }; diff --git a/src/usability.ui b/src/usability.ui index 731c8c2..14369bd 100644 --- a/src/usability.ui +++ b/src/usability.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Usability</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Usability</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox12</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>PushAdd</cstring> </property> @@ -49,12 +49,12 @@ <string>Alt+K</string> </property> </widget> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>NewHost</cstring> </property> </widget> - <widget class="QSpinBox" row="2" column="2"> + <widget class="TQSpinBox" row="2" column="2"> <property name="name"> <cstring>kcfg_TrackHostExitsExpire</cstring> </property> @@ -62,7 +62,7 @@ <string> minutes</string> </property> </widget> - <widget class="QListView" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQListView" row="0" column="2" rowspan="1" colspan="2"> <column> <property name="text"> <string>Domains </string> @@ -81,7 +81,7 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -89,7 +89,7 @@ <string>Maximum Length of Session Time:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -150,7 +150,7 @@ </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4_2_2_2_2</cstring> </property> @@ -158,7 +158,7 @@ <string>Don't reuse a connection if it is more than</string> </property> </widget> - <widget class="QSpinBox" row="2" column="2"> + <widget class="TQSpinBox" row="2" column="2"> <property name="name"> <cstring>kcfg_MaxCircuitDirtiness</cstring> </property> @@ -169,7 +169,7 @@ <number>9999</number> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox13</cstring> </property> @@ -197,7 +197,7 @@ </size> </property> </spacer> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>clearSelected</cstring> </property> @@ -205,7 +205,7 @@ <string>Clear Selected</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -213,7 +213,7 @@ <string><p> These services are known to have long session times. Select any of them that you use and this will ensure that their traffic is routed over servers that have a high-availability rating (i.e. are rarely offline).</string> </property> </widget> - <widget class="QListView" row="0" column="2"> + <widget class="TQListView" row="0" column="2"> <column> <property name="text"> <string>Services </string> @@ -296,9 +296,9 @@ </connection> <connection> <sender>TrackHostExits</sender> - <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> + <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> <receiver>Usability</receiver> - <slot>TrackHostExits_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> + <slot>TrackHostExits_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> </connection> <connection> <sender>PushAdd</sender> @@ -322,7 +322,7 @@ <slots> <slot>LongLivedPorts_selectionChanged()</slot> <slot>PushAdd_clicked()</slot> - <slot>TrackHostExits_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> + <slot>TrackHostExits_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> <slot>slotDeleteEntry()</slot> <slot>clearSelected_clicked()</slot> </slots> diff --git a/src/usability.ui.h b/src/usability.ui.h index 4d0f677..b4866c0 100644 --- a/src/usability.ui.h +++ b/src/usability.ui.h @@ -23,17 +23,17 @@ #include "torkconfig.h" #include "portsandnames.h" #include <klocale.h> -#include <qtooltip.h> -#include <qpopupmenu.h> +#include <ntqtooltip.h> +#include <ntqpopupmenu.h> #include <kdebug.h> void Usability::init() { - QListViewItemIterator it(LongLivedPorts); + TQListViewItemIterator it(LongLivedPorts); while ( it.current() ) { int i; - QString port; + TQString port; for (i = 0; _port_name[i].port; ++i) { portsandnames_t *pics = &_port_name[i]; if (it.current()->text(0) == pics->name){ @@ -47,13 +47,13 @@ void Usability::init() ++it; } - QStringList existingTracks = TorkConfig::trackHostExits(); - QListViewItem *tm; - for ( QStringList::Iterator it = existingTracks.begin(); it != existingTracks.end(); ++it ) + TQStringList existingTracks = TorkConfig::trackHostExits(); + TQListViewItem *tm; + for ( TQStringList::Iterator it = existingTracks.begin(); it != existingTracks.end(); ++it ) { if ((*it).isEmpty()) continue; - tm = new QListViewItem(TrackHostExits,(*it)); + tm = new TQListViewItem(TrackHostExits,(*it)); } } @@ -68,15 +68,15 @@ void Usability::LongLivedPorts_selectionChanged() void Usability::PushAdd_clicked() { - new QListViewItem(TrackHostExits,NewHost->text()); + new TQListViewItem(TrackHostExits,NewHost->text()); } -void Usability::TrackHostExits_contextMenuRequested( QListViewItem *, const QPoint &point, int ) +void Usability::TrackHostExits_contextMenuRequested( TQListViewItem *, const TQPoint &point, int ) { - QPopupMenu *menu = new QPopupMenu( TrackHostExits ); + TQPopupMenu *menu = new TQPopupMenu( TrackHostExits ); menu->clear(); menu->insertItem( "Delete Entry", this,SLOT(slotDeleteEntry()) ); @@ -88,7 +88,7 @@ void Usability::TrackHostExits_contextMenuRequested( QListViewItem *, const QPoi void Usability::slotDeleteEntry( ) { - QListViewItemIterator it(TrackHostExits, QListViewItemIterator::Selected); + TQListViewItemIterator it(TrackHostExits, TQListViewItemIterator::Selected); while ( it.current() ) { if (TrackHostExits->isSelected( it.current())) delete it.current(); @@ -108,9 +108,9 @@ void Usability::slotDeleteEntry( ) // </connection> // <connection> // <sender>TrackHostExits</sender> -// <signal>contextMenuRequested(QListViewItem*,const QPoint&,int)</signal> +// <signal>contextMenuRequested(TQListViewItem*,const TQPoint&,int)</signal> // <receiver>Usability</receiver> -// <slot>TrackHostExits_contextMenuRequested(QListViewItem*,const QPoint&,int)</slot> +// <slot>TrackHostExits_contextMenuRequested(TQListViewItem*,const TQPoint&,int)</slot> // </connection> // <connection> // <sender>PushAdd</sender> @@ -127,7 +127,7 @@ void Usability::slotDeleteEntry( ) // </signals> // <slots> // <slot>LongLivedPorts_selectionChanged()</slot> -// <slot>TrackHostExits_contextMenuRequested( QListViewItem *, const QPoint & point, int )</slot> +// <slot>TrackHostExits_contextMenuRequested( TQListViewItem *, const TQPoint & point, int )</slot> // <slot>slotDeleteEntry()</slot> // <slot>PushAdd_clicked()</slot> // </slots> @@ -142,7 +142,7 @@ void Usability::slotDeleteEntry( ) void Usability::clearSelected_clicked() { - QListViewItemIterator it(LongLivedPorts, QListViewItemIterator::Selected); + TQListViewItemIterator it(LongLivedPorts, TQListViewItemIterator::Selected); while ( it.current() ) { it.current()->listView()->setSelected(it.current(),false); ++it; diff --git a/src/warnings.h b/src/warnings.h index dbd01a4..e80d5d7 100644 --- a/src/warnings.h +++ b/src/warnings.h @@ -20,14 +20,14 @@ ***************************************************************************/ #include "tork.h" -#include <qstring.h> +#include <ntqstring.h> typedef struct message_t { const char *logmessage; /**< The full keyword (case insensitive). */ - const QString headline; /**< String (or null) describing initial value. */ + const TQString headline; /**< String (or null) describing initial value. */ char torsaid[250]; /**< String (or null) describing initial value. */ - const QString body; /**< String (or null) describing initial value. */ - const QString type; /**< String (or null) describing initial value. */ + const TQString body; /**< String (or null) describing initial value. */ + const TQString type; /**< String (or null) describing initial value. */ const char *icon; /**< String (or null) describing initial value. */ bool (tork::*pt2Member)(); display_status_t state; /**< The type of the value. */ |