diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 20:34:15 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-28 20:34:15 +0000 |
commit | 1c1403293485f35fd53db45aaa77a01cdd9627e7 (patch) | |
tree | 38559cd68cd4f63023fb5f6375def9db3b8b491e /plugins/ipfilter | |
parent | 894f94545727610df22c4f73911d62d58266f695 (diff) | |
download | ktorrent-1c1403293485f35fd53db45aaa77a01cdd9627e7.tar.gz ktorrent-1c1403293485f35fd53db45aaa77a01cdd9627e7.zip |
TQt4 port ktorrent
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktorrent@1238733 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'plugins/ipfilter')
-rw-r--r-- | plugins/ipfilter/antip2p.cpp | 20 | ||||
-rw-r--r-- | plugins/ipfilter/antip2p.h | 14 | ||||
-rw-r--r-- | plugins/ipfilter/convert_dlg.ui | 26 | ||||
-rw-r--r-- | plugins/ipfilter/convertdialog.cpp | 56 | ||||
-rw-r--r-- | plugins/ipfilter/convertdialog.h | 7 | ||||
-rw-r--r-- | plugins/ipfilter/ipblockingpref.ui | 34 | ||||
-rw-r--r-- | plugins/ipfilter/ipblockingprefpage.cpp | 48 | ||||
-rw-r--r-- | plugins/ipfilter/ipblockingprefpage.h | 8 | ||||
-rw-r--r-- | plugins/ipfilter/ipfilterplugin.cpp | 18 | ||||
-rw-r--r-- | plugins/ipfilter/ipfilterplugin.h | 9 |
10 files changed, 121 insertions, 119 deletions
diff --git a/plugins/ipfilter/antip2p.cpp b/plugins/ipfilter/antip2p.cpp index 28f9b24..b3755ec 100644 --- a/plugins/ipfilter/antip2p.cpp +++ b/plugins/ipfilter/antip2p.cpp @@ -28,8 +28,8 @@ #include <kglobal.h> #include <kstandarddirs.h> -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> using namespace bt; @@ -46,7 +46,7 @@ namespace kt return ip1 < b.ip1;// a and b intersect } - Uint32 AntiP2P::toUint32(const QString& ip) + Uint32 AntiP2P::toUint32(const TQString& ip) { bool test; Uint32 ret = ip.section('.',0,0).toULongLong(&test); @@ -60,26 +60,26 @@ namespace kt return ret; } - QString fromUint32(Uint32 ip) + TQString fromUint32(Uint32 ip) { Uint32 tmp = ip; - QString out; + TQString out; tmp = ip; tmp &= 0x000000FF; - out.prepend(QString("%1").arg(tmp)); + out.prepend(TQString("%1").tqarg(tmp)); ip >>= 8; tmp = ip; tmp &= 0x000000FF; - out.prepend(QString("%1.").arg(tmp)); + out.prepend(TQString("%1.").tqarg(tmp)); ip >>= 8; tmp = ip; tmp &= 0x000000FF; - out.prepend(QString("%1.").arg(tmp)); + out.prepend(TQString("%1.").tqarg(tmp)); ip >>= 8; tmp = ip; tmp &= 0x000000FF; - out.prepend(QString("%1.").arg(tmp)); + out.prepend(TQString("%1.").tqarg(tmp)); return out; } @@ -152,7 +152,7 @@ namespace kt return file != 0; } - bool AntiP2P::isBlockedIP(const QString& ip ) + bool AntiP2P::isBlockedIP(const TQString& ip ) { Uint32 test = toUint32(ip); return isBlockedIP(test); diff --git a/plugins/ipfilter/antip2p.h b/plugins/ipfilter/antip2p.h index 48350e3..ce54c53 100644 --- a/plugins/ipfilter/antip2p.h +++ b/plugins/ipfilter/antip2p.h @@ -24,8 +24,8 @@ #include <util/mmapfile.h> #include <util/constants.h> -#include <qvaluelist.h> -#include <qstring.h> +#include <tqvaluelist.h> +#include <tqstring.h> namespace kt { @@ -70,9 +70,9 @@ namespace kt /** * Checks if specified IP is listed in filter file. * @return TRUE if IP should be blocked, FALSE otherwise - * @param ip QString representation of IP to be checked + * @param ip TQString representation of IP to be checked **/ - bool isBlockedIP(const QString& ip); + bool isBlockedIP(const TQString& ip); /** * Overloaded function. Uses Uint32 IP to be checked @@ -80,13 +80,13 @@ namespace kt bool isBlockedIP(bt::Uint32& ip); /** - * This function converts QString IP to Uint32 format. + * This function converts TQString IP to Uint32 format. **/ - static bt::Uint32 toUint32(const QString& ip); + static bt::Uint32 toUint32(const TQString& ip); private: bt::MMapFile* file; - QValueList<HeaderBlock> blocks; + TQValueList<HeaderBlock> blocks; ///Is AntiP2P header loaded bool header_loaded; diff --git a/plugins/ipfilter/convert_dlg.ui b/plugins/ipfilter/convert_dlg.ui index cc246ed..b63b4f7 100644 --- a/plugins/ipfilter/convert_dlg.ui +++ b/plugins/ipfilter/convert_dlg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConvertingDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ConvertingDlg</cstring> </property> @@ -33,7 +33,7 @@ <property name="resizeMode"> <enum>Fixed</enum> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -46,14 +46,14 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> <property name="indent"> <number>-2</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lbl_progress</cstring> </property> @@ -73,22 +73,22 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>390</width> <height>0</height> </size> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label1</cstring> </property> @@ -96,7 +96,7 @@ <string></string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnClose</cstring> </property> @@ -112,7 +112,7 @@ <string>&Close</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnCancel</cstring> </property> @@ -146,11 +146,11 @@ <slot>btnCancel_clicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>btnClose_clicked()</slot> <slot>btnCancel_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> </includehints> diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp index 6fed40f..c8fef33 100644 --- a/plugins/ipfilter/convertdialog.cpp +++ b/plugins/ipfilter/convertdialog.cpp @@ -34,15 +34,15 @@ #include <torrent/globals.h> #include <interfaces/coreinterface.h> -#include <qfile.h> -#include <qstringlist.h> -#include <qtextstream.h> -#include <qregexp.h> -#include <qvalidator.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qevent.h> -#include <qurloperator.h> +#include <tqfile.h> +#include <tqstringlist.h> +#include <tqtextstream.h> +#include <tqregexp.h> +#include <tqvalidator.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqevent.h> +#include <tqurloperator.h> #include "antip2p.h" using namespace bt; @@ -51,7 +51,7 @@ namespace kt { - Uint32 toUint32(QString& ip) + Uint32 toUint32(TQString& ip) { bool test; Uint32 ret = ip.section('.',0,0).toULongLong(&test); @@ -65,17 +65,17 @@ namespace kt return ret; } - IPBlock RangeToBlock(const QString& range) + IPBlock RangeToBlock(const TQString& range) { IPBlock block; - QStringList ls = QStringList::split('-', range); + TQStringList ls = TQStringList::split('-', range); block.ip1 = toUint32(ls[0]); block.ip2 = toUint32(ls[1]); return block; } - ConvertDialog::ConvertDialog( IPFilterPlugin* p, QWidget *parent, const char *name ) - : ConvertingDlg( parent, name ) + ConvertDialog::ConvertDialog( IPFilterPlugin* p, TQWidget *tqparent, const char *name ) + : ConvertingDlg( tqparent, name ) { m_plugin = p; btnClose->setText(i18n("Convert")); @@ -87,9 +87,9 @@ namespace kt void ConvertDialog::convert() { - QFile source( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.txt" ); - QFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); - QFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp" ); + TQFile source( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.txt" ); + TQFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); + TQFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp" ); if(target.exists()) { @@ -98,7 +98,7 @@ namespace kt } /* READ INPUT FILE */ - QValueList<IPBlock> list; + TQValueList<IPBlock> list; lbl_progress->setText( i18n( "Loading txt file..." ) ); label1->setText( i18n("Please wait...") ); ulong source_size = source.size(); @@ -109,12 +109,12 @@ namespace kt if ( source.open( IO_ReadOnly ) ) { - QTextStream stream( &source ); + TQTextStream stream( &source ); kProgress1->setEnabled(true); int i = 0; - QRegExp rx( "[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}-[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}" ); - QRegExpValidator v( rx, 0 ); + TQRegExp rx( "[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}-[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}" ); + TQRegExpValidator v( rx, 0 ); int poz = 0; while ( !stream.atEnd() ) @@ -123,13 +123,13 @@ namespace kt return; KApplication::kApplication() ->processEvents(); - QString line = stream.readLine(); + TQString line = stream.readLine(); i += line.length() * sizeof( char ); //rough estimation of string size kProgress1->setProgress( i * 100 / source_size ); ++i; - QString ip_part = line.section( ':' , -1 ); - if ( v.validate( ip_part, poz ) != QValidator::Acceptable ) + TQString ip_part = line.section( ':' , -1 ); + if ( v.validate( ip_part, poz ) != TQValidator::Acceptable ) continue; else ++counter; @@ -172,7 +172,7 @@ namespace kt Out(SYS_IPF|LOG_NOTICE) << "Loading finished. Starting conversion..." << endl; - QValueList<IPBlock>::iterator iter; + TQValueList<IPBlock>::iterator iter; int i = 0; for (iter = list.begin(); iter != list.end(); ++iter, ++i) { @@ -226,7 +226,7 @@ namespace kt this->close(); } - void ConvertDialog::closeEvent(QCloseEvent* e) + void ConvertDialog::closeEvent(TQCloseEvent* e) { if(!converting) e->accept(); @@ -238,11 +238,11 @@ namespace kt { if(converting) { - QFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); + TQFile target( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat" ); if(target.exists()) target.remove(); - QFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp"); + TQFile temp( KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp"); if(temp.exists()) { KIO::NetAccess::file_copy(KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat.tmp", KGlobal::dirs() ->saveLocation( "data", "ktorrent" ) + "level1.dat", -1, true); diff --git a/plugins/ipfilter/convertdialog.h b/plugins/ipfilter/convertdialog.h index be451f3..53eab64 100644 --- a/plugins/ipfilter/convertdialog.h +++ b/plugins/ipfilter/convertdialog.h @@ -23,16 +23,17 @@ #include "convert_dlg.h" #include "ipfilterplugin.h" -#include <qevent.h> +#include <tqevent.h> namespace kt { class ConvertDialog: public ConvertingDlg { Q_OBJECT + TQ_OBJECT public: - ConvertDialog( IPFilterPlugin* p, QWidget *parent = 0, const char *name = 0 ); + ConvertDialog( IPFilterPlugin* p, TQWidget *tqparent = 0, const char *name = 0 ); public slots: virtual void btnClose_clicked(); @@ -45,7 +46,7 @@ namespace kt bool canceled; private slots: - void closeEvent(QCloseEvent* e); + void closeEvent(TQCloseEvent* e); virtual void btnCancel_clicked(); }; } diff --git a/plugins/ipfilter/ipblockingpref.ui b/plugins/ipfilter/ipblockingpref.ui index 43870f0..afb13c0 100644 --- a/plugins/ipfilter/ipblockingpref.ui +++ b/plugins/ipfilter/ipblockingpref.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>IPBlockingPref</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>IPBlockingPref</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -50,7 +50,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>checkUseLevel1</cstring> </property> @@ -61,15 +61,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -90,9 +90,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -108,14 +108,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>361</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnDownload</cstring> </property> @@ -125,7 +125,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -134,7 +134,7 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>lbl_status1</cstring> </property> @@ -152,7 +152,7 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -191,12 +191,12 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string> <slot>setEnabled(bool)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>btnDownload_clicked()</slot> <slot>checkUseLevel1_toggled(bool)</slot> <slot>checkUseKTfilter_toggled(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/plugins/ipfilter/ipblockingprefpage.cpp b/plugins/ipfilter/ipblockingprefpage.cpp index 6d06d1b..41d427d 100644 --- a/plugins/ipfilter/ipblockingprefpage.cpp +++ b/plugins/ipfilter/ipblockingprefpage.cpp @@ -40,14 +40,14 @@ #include <torrent/globals.h> #include <interfaces/coreinterface.h> -#include <qthread.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qregexp.h> -#include <qvalidator.h> -#include <qlayout.h> -#include <qdialog.h> -#include <qobject.h> +#include <tqthread.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqregexp.h> +#include <tqvalidator.h> +#include <tqlayout.h> +#include <tqdialog.h> +#include <tqobject.h> using namespace bt; @@ -55,11 +55,11 @@ using namespace bt; namespace kt { - IPBlockingPrefPageWidget::IPBlockingPrefPageWidget(QWidget* parent) : IPBlockingPref(parent) + IPBlockingPrefPageWidget::IPBlockingPrefPageWidget(TQWidget* tqparent) : IPBlockingPref(tqparent) { m_url->setURL(IPBlockingPluginSettings::filterURL()); if (m_url->url() == "") - m_url->setURL(QString("http://www.bluetack.co.uk/config/splist.zip")); + m_url->setURL(TQString("http://www.bluetack.co.uk/config/splist.zip")); bool use_level1 = IPBlockingPluginSettings::useLevel1(); @@ -67,13 +67,13 @@ namespace kt if(use_level1) { - lbl_status1->setText(i18n("Status: Loaded and running.")); + lbl_status1->setText(i18n("tqStatus: Loaded and running.")); m_url->setEnabled(true); btnDownload->setEnabled(true); } else { - lbl_status1->setText(i18n("Status: Not loaded.")); + lbl_status1->setText(i18n("tqStatus: Not loaded.")); m_url->setEnabled(false); btnDownload->setEnabled(false); } @@ -89,21 +89,21 @@ namespace kt if(checkUseLevel1->isChecked()) { - QFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); + TQFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); if(target.exists()) - lbl_status1->setText(i18n("Status: Loaded and running.")); + lbl_status1->setText(i18n("tqStatus: Loaded and running.")); else - lbl_status1->setText(i18n("Status: <font color=\"#ff0000\">Filter file not found.</font> Download and convert filter file.")); + lbl_status1->setText(i18n("tqStatus: <font color=\"#ff0000\">Filter file not found.</font> Download and convert filter file.")); } else - lbl_status1->setText(i18n("Status: Not loaded.")); + lbl_status1->setText(i18n("tqStatus: Not loaded.")); } void IPBlockingPrefPageWidget::btnDownload_clicked() { - QString target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1"); - QFile target_file(target); - QFile txtfile(target + ".txt"); + TQString target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1"); + TQFile target_file(target); + TQFile txtfile(target + ".txt"); KURL url(m_url->url()); KURL dest(target); KURL temp(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.tmp"); @@ -132,8 +132,8 @@ namespace kt } else { - QString err = KIO::NetAccess::lastErrorString(); - if(err != QString::null) + TQString err = KIO::NetAccess::lastErrorString(); + if(err != TQString()) KMessageBox::error(0,KIO::NetAccess::lastErrorString(),i18n("Error")); else KIO::NetAccess::move(temp, target); @@ -188,7 +188,7 @@ namespace kt void IPBlockingPrefPageWidget::convert() { - QFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); + TQFile target(KGlobal::dirs()->saveLocation("data","ktorrent") + "level1.dat"); if(target.exists()) { if((KMessageBox::questionYesNo(this,i18n("Filter file (level1.dat) already exists, do you want to convert it again?"),i18n("File Exists")) == 4)) @@ -240,9 +240,9 @@ namespace kt return true; } - void IPBlockingPrefPage::createWidget(QWidget* parent) + void IPBlockingPrefPage::createWidget(TQWidget* tqparent) { - widget = new IPBlockingPrefPageWidget(parent); + widget = new IPBlockingPrefPageWidget(tqparent); widget->setPlugin(m_plugin); widget->setPrefPage(this); } diff --git a/plugins/ipfilter/ipblockingprefpage.h b/plugins/ipfilter/ipblockingprefpage.h index 3779965..7626bea 100644 --- a/plugins/ipfilter/ipblockingprefpage.h +++ b/plugins/ipfilter/ipblockingprefpage.h @@ -25,8 +25,8 @@ #include "ipblockingpref.h" #include "ipfilterplugin.h" #include <interfaces/coreinterface.h> -#include <qthread.h> -#include <qobject.h> +#include <tqthread.h> +#include <tqobject.h> class KProgress; @@ -41,7 +41,7 @@ namespace kt class IPBlockingPrefPageWidget : public IPBlockingPref { public: - IPBlockingPrefPageWidget(QWidget *parent = 0); + IPBlockingPrefPageWidget(TQWidget *tqparent = 0); void apply(); void convert(); void setPlugin(IPFilterPlugin* p); @@ -70,7 +70,7 @@ namespace kt virtual ~IPBlockingPrefPage(); virtual bool apply(); - virtual void createWidget(QWidget* parent); + virtual void createWidget(TQWidget* tqparent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/ipfilter/ipfilterplugin.cpp b/plugins/ipfilter/ipfilterplugin.cpp index 2f53197..8381226 100644 --- a/plugins/ipfilter/ipfilterplugin.cpp +++ b/plugins/ipfilter/ipfilterplugin.cpp @@ -25,7 +25,7 @@ #include <util/constants.h> #include <torrent/ipblocklist.h> -#include <qstring.h> +#include <tqstring.h> #include "ipfilterplugin.h" #include "ipfilterpluginsettings.h" @@ -37,13 +37,13 @@ K_EXPORT_COMPONENT_FACTORY(ktipfilterplugin,KGenericFactory<kt::IPFilterPlugin>( namespace kt { - const QString NAME = "IP Filter"; - const QString AUTHOR = "Ivan Vasic"; - const QString EMAIL = "ivasic@gmail.com"; - const QString DESCRIPTION = i18n("Filters out unwanted peers based on their IP address"); + const TQString NAME = "IP Filter"; + const TQString AUTHOR = "Ivan Vasic"; + const TQString EMAIL = "ivasic@gmail.com"; + const TQString DESCRIPTION = i18n("Filters out unwanted peers based on their IP address"); - IPFilterPlugin::IPFilterPlugin(QObject* parent, const char* name, const QStringList& args) - : Plugin(parent, name, args,NAME,i18n("IP Filter"),AUTHOR,EMAIL,DESCRIPTION,"filter") + IPFilterPlugin::IPFilterPlugin(TQObject* tqparent, const char* name, const TQStringList& args) + : Plugin(tqparent, name, args,NAME,i18n("IP Filter"),AUTHOR,EMAIL,DESCRIPTION,"filter") { // setXMLFile("ktpluginui.rc"); level1 = 0; @@ -114,7 +114,7 @@ namespace kt return true; } - bool IPFilterPlugin::isBlockedIP(const QString& ip) + bool IPFilterPlugin::isBlockedIP(const TQString& ip) { if (level1 == 0) return false; @@ -122,7 +122,7 @@ namespace kt return level1->isBlockedIP(ip); } - bool IPFilterPlugin::versionCheck(const QString & version) const + bool IPFilterPlugin::versionCheck(const TQString & version) const { return version == KT_VERSION_MACRO; } diff --git a/plugins/ipfilter/ipfilterplugin.h b/plugins/ipfilter/ipfilterplugin.h index 2e9c984..d016ee9 100644 --- a/plugins/ipfilter/ipfilterplugin.h +++ b/plugins/ipfilter/ipfilterplugin.h @@ -27,7 +27,7 @@ #include "ipblockingprefpage.h" #include "antip2p.h" -class QString; +class TQString; namespace kt { @@ -42,8 +42,9 @@ namespace kt class IPFilterPlugin : public Plugin, public kt::IPBlockingInterface { Q_OBJECT + TQ_OBJECT public: - IPFilterPlugin(QObject* parent, const char* name, const QStringList& args); + IPFilterPlugin(TQObject* tqparent, const char* name, const TQStringList& args); virtual ~IPFilterPlugin(); virtual void load(); @@ -60,9 +61,9 @@ namespace kt ///Checks if IP is listed in AntiP2P filter list. - bool isBlockedIP(const QString& ip); + bool isBlockedIP(const TQString& ip); - bool versionCheck(const QString & version) const; + bool versionCheck(const TQString & version) const; private: IPBlockingPrefPage* pref; AntiP2P* level1; |