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/search | |
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/search')
-rw-r--r-- | plugins/search/htmlpart.cpp | 38 | ||||
-rw-r--r-- | plugins/search/htmlpart.h | 11 | ||||
-rw-r--r-- | plugins/search/searchbar.ui | 8 | ||||
-rw-r--r-- | plugins/search/searchenginelist.cpp | 44 | ||||
-rw-r--r-- | plugins/search/searchenginelist.h | 14 | ||||
-rw-r--r-- | plugins/search/searchplugin.cpp | 26 | ||||
-rw-r--r-- | plugins/search/searchplugin.h | 13 | ||||
-rw-r--r-- | plugins/search/searchpref.ui | 56 | ||||
-rw-r--r-- | plugins/search/searchprefpage.cpp | 104 | ||||
-rw-r--r-- | plugins/search/searchprefpage.h | 9 | ||||
-rw-r--r-- | plugins/search/searchtab.cpp | 44 | ||||
-rw-r--r-- | plugins/search/searchtab.h | 9 | ||||
-rw-r--r-- | plugins/search/searchwidget.cpp | 82 | ||||
-rw-r--r-- | plugins/search/searchwidget.h | 15 |
14 files changed, 239 insertions, 234 deletions
diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index b1c6b23..00d5326 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -20,9 +20,9 @@ #include <kmessagebox.h> #include <kio/job.h> #include <kio/jobclasses.h> -//#include <qfile.h> -#include <qclipboard.h> -#include <qapplication.h> +//#include <tqfile.h> +#include <tqclipboard.h> +#include <tqapplication.h> #include <kio/netaccess.h> #include <klocale.h> #include <kfiledialog.h> @@ -36,8 +36,8 @@ using namespace bt; namespace kt { - HTMLPart::HTMLPart(QWidget *parent) - : KHTMLPart(parent) + HTMLPart::HTMLPart(TQWidget *tqparent) + : KHTMLPart(tqparent) { setJScriptEnabled(true); setJavaEnabled(true); @@ -45,8 +45,8 @@ namespace kt setPluginsEnabled(false); setStatusMessagesEnabled(false); KParts::BrowserExtension* ext = this->browserExtension(); - connect(ext,SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)), - this,SLOT(openURLRequest(const KURL&, const KParts::URLArgs& ))); + connect(ext,TQT_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)), + this,TQT_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& ))); ext->enableAction("copy",true); ext->enableAction("paste",true); @@ -59,11 +59,11 @@ namespace kt void HTMLPart::copy() { - QString txt = selectedText(); - QClipboard *cb = QApplication::clipboard(); + TQString txt = selectedText(); + TQClipboard *cb = TQApplication::tqclipboard(); // Copy text into the clipboard if (cb) - cb->setText(txt,QClipboard::Clipboard); + cb->setText(txt,TQClipboard::Clipboard); } void HTMLPart::openURLRequest(const KURL &u,const KParts::URLArgs &) @@ -75,15 +75,15 @@ namespace kt } KIO::TransferJob* j = KIO::get(u,false,false); - connect(j,SIGNAL(data(KIO::Job*,const QByteArray &)), - this,SLOT(dataRecieved(KIO::Job*, const QByteArray& ))); - connect(j,SIGNAL(result(KIO::Job*)),this,SLOT(jobDone(KIO::Job* ))); - connect(j,SIGNAL(mimetype(KIO::Job*, const QString &)), - this,SLOT(mimetype(KIO::Job*, const QString& ))); + connect(j,TQT_SIGNAL(data(KIO::Job*,const TQByteArray &)), + this,TQT_SLOT(dataRecieved(KIO::Job*, const TQByteArray& ))); + connect(j,TQT_SIGNAL(result(KIO::Job*)),this,TQT_SLOT(jobDone(KIO::Job* ))); + connect(j,TQT_SIGNAL(mimetype(KIO::Job*, const TQString &)), + this,TQT_SLOT(mimetype(KIO::Job*, const TQString& ))); active_job = j; curr_data.resize(0); - mime_type = QString::null; + mime_type = TQString(); curr_url = u; } @@ -115,7 +115,7 @@ namespace kt openURL(url()); } - void HTMLPart::dataRecieved(KIO::Job* job,const QByteArray & data) + void HTMLPart::dataRecieved(KIO::Job* job,const TQByteArray & data) { if (job != active_job) { @@ -134,7 +134,7 @@ namespace kt } } - void HTMLPart::mimetype(KIO::Job* job,const QString & mt) + void HTMLPart::mimetype(KIO::Job* job,const TQString & mt) { if (job != active_job) { @@ -191,7 +191,7 @@ namespace kt active_job = 0; curr_data.resize(0); curr_url = KURL(); - mime_type = QString::null; + mime_type = TQString(); } } diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h index f5b78ee..8b400dc 100644 --- a/plugins/search/htmlpart.h +++ b/plugins/search/htmlpart.h @@ -37,8 +37,9 @@ namespace kt class HTMLPart : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: - HTMLPart(QWidget *parent = 0); + HTMLPart(TQWidget *tqparent = 0); virtual ~HTMLPart(); public slots: @@ -49,8 +50,8 @@ namespace kt private slots: void addToHistory(const KURL & url); - void dataRecieved(KIO::Job* job,const QByteArray & data); - void mimetype(KIO::Job* job,const QString & mt); + void dataRecieved(KIO::Job* job,const TQByteArray & data); + void mimetype(KIO::Job* job,const TQString & mt); void jobDone(KIO::Job* job); @@ -63,8 +64,8 @@ namespace kt private: KURL::List history; KIO::Job* active_job; - QByteArray curr_data; - QString mime_type; + TQByteArray curr_data; + TQString mime_type; KURL curr_url; }; } diff --git a/plugins/search/searchbar.ui b/plugins/search/searchbar.ui index 2b91ea0..a0e0db0 100644 --- a/plugins/search/searchbar.ui +++ b/plugins/search/searchbar.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SearchBar</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SearchBar</cstring> </property> @@ -63,14 +63,14 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>60</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -87,7 +87,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/plugins/search/searchenginelist.cpp b/plugins/search/searchenginelist.cpp index cf7a11b..9e22990 100644 --- a/plugins/search/searchenginelist.cpp +++ b/plugins/search/searchenginelist.cpp @@ -17,9 +17,9 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qfile.h> -#include <qtextstream.h> -#include <qstringlist.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstringlist.h> #include "searchenginelist.h" using namespace bt; @@ -34,36 +34,36 @@ namespace kt SearchEngineList::~SearchEngineList() {} - void SearchEngineList::save(const QString& file) + void SearchEngineList::save(const TQString& file) { - QFile fptr(file); + TQFile fptr(file); if (!fptr.open(IO_WriteOnly)) return; - QTextStream out(&fptr); + TQTextStream out(&fptr); out << "# PLEASE DO NOT MODIFY THIS FILE. Use KTorrent configuration dialog for adding new search engines." << ::endl; out << "# SEARCH ENGINES list" << ::endl; - QValueList<SearchEngine>::iterator i = m_search_engines.begin(); + TQValueList<SearchEngine>::iterator i = m_search_engines.begin(); while (i != m_search_engines.end()) { SearchEngine & e = *i; // replace spaces by %20 - QString name = e.name; - name = name.replace(" ","%20"); - QString u = e.url.prettyURL(); - u = u.replace(" ","%20"); + TQString name = e.name; + name = name.tqreplace(" ","%20"); + TQString u = e.url.prettyURL(); + u = u.tqreplace(" ","%20"); out << name << " " << u << ::endl; i++; } } - void SearchEngineList::load(const QString& file) + void SearchEngineList::load(const TQString& file) { m_search_engines.clear(); - QFile fptr(file); + TQFile fptr(file); if(!fptr.exists()) makeDefaultFile(file); @@ -71,21 +71,21 @@ namespace kt if (!fptr.open(IO_ReadOnly)) return; - QTextStream in(&fptr); + TQTextStream in(&fptr); int id = 0; while (!in.atEnd()) { - QString line = in.readLine(); + TQString line = in.readLine(); if(line.startsWith("#") || line.startsWith(" ") || line.isEmpty() ) continue; - QStringList tokens = QStringList::split(" ", line); + TQStringList tokens = TQStringList::split(" ", line); SearchEngine se; se.name = tokens[0]; - se.name = se.name.replace("%20"," "); + se.name = se.name.tqreplace("%20"," "); se.url = KURL::fromPathOrURL(tokens[1]); for(Uint32 i=2; i<tokens.count(); ++i) @@ -95,13 +95,13 @@ namespace kt } } - void SearchEngineList::makeDefaultFile(const QString& file) + void SearchEngineList::makeDefaultFile(const TQString& file) { - QFile fptr(file); + TQFile fptr(file); if (!fptr.open(IO_WriteOnly)) return; - QTextStream out(&fptr); + TQTextStream out(&fptr); out << "# PLEASE DO NOT MODIFY THIS FILE. Use KTorrent configuration dialog for adding new search engines." << ::endl; out << "# SEARCH ENGINES list" << ::endl; out << "KTorrents http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0" << ::endl; @@ -123,10 +123,10 @@ namespace kt return m_search_engines[engine].url; } - QString SearchEngineList::getEngineName(bt::Uint32 engine) const + TQString SearchEngineList::getEngineName(bt::Uint32 engine) const { if (engine >= m_search_engines.count()) - return QString::null; + return TQString(); else return m_search_engines[engine].name; } diff --git a/plugins/search/searchenginelist.h b/plugins/search/searchenginelist.h index 236b8eb..4b4d68e 100644 --- a/plugins/search/searchenginelist.h +++ b/plugins/search/searchenginelist.h @@ -21,7 +21,7 @@ #define KTSEARCHENGINELIST_H #include <kurl.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <util/constants.h> namespace kt @@ -35,21 +35,21 @@ namespace kt { struct SearchEngine { - QString name; + TQString name; KURL url; }; - QValueList<SearchEngine> m_search_engines; + TQValueList<SearchEngine> m_search_engines; public: SearchEngineList(); virtual ~SearchEngineList(); - void save(const QString& file); - void load(const QString& file); - void makeDefaultFile(const QString& file); + void save(const TQString& file); + void load(const TQString& file); + void makeDefaultFile(const TQString& file); KURL getSearchURL(bt::Uint32 engine) const; - QString getEngineName(bt::Uint32 engine) const; + TQString getEngineName(bt::Uint32 engine) const; /// Get the number of engines bt::Uint32 getNumEngines() const {return m_search_engines.count();} diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp index c674369..8638dfe 100644 --- a/plugins/search/searchplugin.cpp +++ b/plugins/search/searchplugin.cpp @@ -46,8 +46,8 @@ K_EXPORT_COMPONENT_FACTORY(ktsearchplugin,KGenericFactory<kt::SearchPlugin>("kts namespace kt { - SearchPlugin::SearchPlugin(QObject* parent, const char* name, const QStringList& args) - : Plugin(parent, name, args,NAME,i18n("Search"),AUTHOR,EMAIL, + SearchPlugin::SearchPlugin(TQObject* tqparent, const char* name, const TQStringList& args) + : Plugin(tqparent, name, args,NAME,i18n("Search"),AUTHOR,EMAIL, i18n("Search for torrents on several popular torrent search engines"),"viewmag") { // setXMLFile("ktsearchpluginui.rc"); @@ -65,8 +65,8 @@ namespace kt engines.load(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); KToolBar* tb = getGUI()->addToolBar("search"); tab = new SearchTab(tb); - connect(tab,SIGNAL(search( const QString&, int, bool )), - this,SLOT(search( const QString&, int, bool ))); + connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )), + this,TQT_SLOT(search( const TQString&, int, bool ))); pref = new SearchPrefPage(this); getGUI()->addPrefPage(pref); @@ -92,7 +92,7 @@ namespace kt tab = 0; } - void SearchPlugin::search(const QString & text,int engine,bool external) + void SearchPlugin::search(const TQString & text,int engine,bool external) { if(external) { @@ -101,14 +101,14 @@ namespace kt if (engine < 0 || engine >= sl.getNumEngines()) engine = 0; - QString s_url = sl.getSearchURL(engine).prettyURL(); - s_url.replace("FOOBAR", KURL::encode_string(text), true); + TQString s_url = sl.getSearchURL(engine).prettyURL(); + s_url.tqreplace("FOOBAR", KURL::encode_string(text), true); KURL url = KURL::fromPathOrURL(s_url); if(SearchPluginSettings::useDefaultBrowser()) kapp->invokeBrowser(url.url()); else - KRun::runCommand(QString("%1 \"%2\"").arg(SearchPluginSettings::customBrowser()).arg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" ); + KRun::runCommand(TQString("%1 \"%2\"").tqarg(SearchPluginSettings::customBrowser()).tqarg(url.url()), SearchPluginSettings::customBrowser(), "viewmag" ); return; } @@ -118,7 +118,7 @@ namespace kt SearchWidget* search = new SearchWidget(this); getGUI()->addTabPage(search,iload->loadIconSet("viewmag", KIcon::Small),text,this); - KAction* copy_act = KStdAction::copy(search,SLOT(copy()),actionCollection()); + KAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection()); copy_act->plug(search->rightClickMenu(),0); searches.append(search); @@ -132,16 +132,16 @@ namespace kt if (tab) tab->updateSearchEngines(engines); - for (QPtrList<SearchWidget>::iterator i = searches.begin(); i != searches.end();i++) + for (TQPtrList<SearchWidget>::iterator i = searches.begin(); i != searches.end();i++) { SearchWidget* w = *i; w->updateSearchEngines(engines); } } - void SearchPlugin::tabCloseRequest(kt::GUIInterface* gui,QWidget* tab) + void SearchPlugin::tabCloseRequest(kt::GUIInterface* gui,TQWidget* tab) { - if (searches.contains((SearchWidget*)tab)) + if (searches.tqcontains((SearchWidget*)tab)) { searches.remove((SearchWidget*)tab); gui->removeTabPage(tab); @@ -149,7 +149,7 @@ namespace kt } } - bool SearchPlugin::versionCheck(const QString & version) const + bool SearchPlugin::versionCheck(const TQString & version) const { return version == KT_VERSION_MACRO; } diff --git a/plugins/search/searchplugin.h b/plugins/search/searchplugin.h index ce65499..9bfbb0b 100644 --- a/plugins/search/searchplugin.h +++ b/plugins/search/searchplugin.h @@ -20,7 +20,7 @@ #ifndef KTSEARCHPLUGIN_H #define KTSEARCHPLUGIN_H -#include <qptrlist.h> +#include <tqptrlist.h> #include <interfaces/plugin.h> #include <interfaces/guiinterface.h> #include "searchenginelist.h" @@ -37,28 +37,29 @@ namespace kt class SearchPlugin : public Plugin, public kt::CloseTabListener { Q_OBJECT + TQ_OBJECT public: - SearchPlugin(QObject* parent, const char* name, const QStringList& args); + SearchPlugin(TQObject* tqparent, const char* name, const TQStringList& args); virtual ~SearchPlugin(); virtual void load(); virtual void unload(); - virtual bool versionCheck(const QString& version) const; + virtual bool versionCheck(const TQString& version) const; void preferencesUpdated(); const SearchEngineList & getSearchEngineList() const {return engines;} private slots: - void search(const QString & text,int engine,bool external); + void search(const TQString & text,int engine,bool external); private: - virtual void tabCloseRequest(kt::GUIInterface* gui,QWidget* tab); + virtual void tabCloseRequest(kt::GUIInterface* gui,TQWidget* tab); private: SearchPrefPage* pref; SearchTab* tab; SearchEngineList engines; - QPtrList<SearchWidget> searches; + TQPtrList<SearchWidget> searches; }; } diff --git a/plugins/search/searchpref.ui b/plugins/search/searchpref.ui index 8c8c026..5e68f1e 100644 --- a/plugins/search/searchpref.ui +++ b/plugins/search/searchpref.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SEPreferences</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SEPreferences</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>350</height> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -44,7 +44,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>openExternal</cstring> </property> @@ -52,7 +52,7 @@ <string>Open searches in external browser</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useDefaultBrowser</cstring> </property> @@ -63,15 +63,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout29</cstring> + <cstring>tqlayout29</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useCustomBrowser</cstring> </property> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -108,7 +108,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -127,15 +127,15 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -150,15 +150,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -171,7 +171,7 @@ <cstring>m_engine_url</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnAdd</cstring> </property> @@ -189,7 +189,7 @@ </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Engines</string> @@ -223,7 +223,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>50</height> @@ -233,15 +233,15 @@ <enum>AllColumns</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRemove</cstring> </property> @@ -249,7 +249,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnRemoveAll</cstring> </property> @@ -267,14 +267,14 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btn_add_default</cstring> </property> @@ -306,10 +306,10 @@ <slot>btnUpdate_clicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>btnUpdate_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kactivelabel.h</includehint> diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp index 2285ead..e7ee9c3 100644 --- a/plugins/search/searchprefpage.cpp +++ b/plugins/search/searchprefpage.cpp @@ -19,8 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include <kurl.h> -#include <qtooltip.h> -#include <qfile.h> +#include <tqtooltip.h> +#include <tqfile.h> #include <klocale.h> #include <kglobal.h> #include <kstandarddirs.h> @@ -33,9 +33,9 @@ #include <kio/netaccess.h> #include <klineedit.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include <util/constants.h> #include "searchprefpage.h" @@ -47,25 +47,25 @@ using namespace bt; namespace kt { - SearchPrefPageWidget::SearchPrefPageWidget(QWidget *parent) : SEPreferences(parent) + SearchPrefPageWidget::SearchPrefPageWidget(TQWidget *tqparent) : SEPreferences(tqparent) { - QString info = i18n("Use your web browser to search for the string %1" + TQString info = i18n("Use your web browser to search for the string %1" " (capital letters) on the search engine you want to add. <br> " "Then copy the URL in the addressbar after the search is finished, and paste it here.<br><br>Searching for %1" " on Google for example, will result in http://www.google.com/search?q=FOOBAR&ie=UTF-8&oe=UTF-8. <br> " - "If you add this URL here, ktorrent can search using Google.").arg("FOOBAR").arg("FOOBAR"); - QString info_short = i18n("Use your web browser to search for the string %1 (capital letters) " - "on the search engine you want to add. Use the resulting URL below.").arg("FOOBAR"); + "If you add this URL here, ktorrent can search using Google.").tqarg("FOOBAR").tqarg("FOOBAR"); + TQString info_short = i18n("Use your web browser to search for the string %1 (capital letters) " + "on the search engine you want to add. Use the resulting URL below.").tqarg("FOOBAR"); m_infoLabel->setText(info_short); - QToolTip::add(m_infoLabel,info); - QToolTip::add(m_engine_name,info); + TQToolTip::add(m_infoLabel,info); + TQToolTip::add(m_engine_name,info); - connect(btnAdd, SIGNAL(clicked()), this, SLOT(addClicked())); - connect(btnRemove, SIGNAL(clicked()), this, SLOT(removeClicked())); - connect(btn_add_default, SIGNAL(clicked()), this, SLOT(addDefaultClicked())); - connect(btnRemoveAll, SIGNAL(clicked()), this, SLOT(removeAllClicked())); + connect(btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked())); + connect(btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeClicked())); + connect(btn_add_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDefaultClicked())); + connect(btnRemoveAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllClicked())); - connect(useCustomBrowser, SIGNAL(toggled(bool)), this, SLOT(customToggled( bool ))); + connect(useCustomBrowser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(customToggled( bool ))); useCustomBrowser->setChecked(SearchPluginSettings::useCustomBrowser()); useDefaultBrowser->setChecked(SearchPluginSettings::useDefaultBrowser()); @@ -81,7 +81,7 @@ namespace kt for (Uint32 i = 0;i < se.getNumEngines();i++) { - new QListViewItem(m_engines,se.getEngineName(i),se.getSearchURL(i).prettyURL()); + new TQListViewItem(m_engines,se.getEngineName(i),se.getSearchURL(i).prettyURL()); } } @@ -99,20 +99,20 @@ namespace kt void SearchPrefPageWidget::saveSearchEngines() { - QFile fptr(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); + TQFile fptr(KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); if (!fptr.open(IO_WriteOnly)) return; - QTextStream out(&fptr); + TQTextStream out(&fptr); out << "# PLEASE DO NOT MODIFY THIS FILE. Use KTorrent configuration dialog for adding new search engines." << ::endl; out << "# SEARCH ENGINES list" << ::endl; - QListViewItemIterator itr(m_engines); + TQListViewItemIterator itr(m_engines); while (itr.current()) { - QListViewItem* item = itr.current(); - QString u = item->text(1); - QString name = item->text(0); - out << name.replace(" ","%20") << " " << u.replace(" ","%20") << endl; + TQListViewItem* item = itr.current(); + TQString u = item->text(1); + TQString name = item->text(0); + out << name.tqreplace(" ","%20") << " " << u.tqreplace(" ","%20") << endl; itr++; } } @@ -123,7 +123,7 @@ namespace kt { KMessageBox::error(this, i18n("You must enter the search engine's name and URL")); } - else if ( m_engine_url->text().contains("FOOBAR") ) + else if ( m_engine_url->text().tqcontains("FOOBAR") ) { KURL url = KURL::fromPathOrURL(m_engine_url->text()); if ( !url.isValid() ) @@ -132,12 +132,12 @@ namespace kt return; } - if (m_engines->findItem(m_engine_name->text(), 0)) + if (m_engines->tqfindItem(m_engine_name->text(), 0)) { KMessageBox::error(this, i18n("A search engine with the same name already exists. Please use a different name.")); return; } - new QListViewItem(m_engines, m_engine_name->text(), m_engine_url->text()); + new TQListViewItem(m_engines, m_engine_name->text(), m_engine_url->text()); m_engine_url->setText(""); m_engine_name->setText(""); } @@ -152,30 +152,30 @@ namespace kt if ( m_engines->selectedItem() == 0 ) return; - QListViewItem* item = m_engines->selectedItem(); + TQListViewItem* item = m_engines->selectedItem(); m_engines->takeItem(item); delete item; } void SearchPrefPageWidget::addDefaultClicked() { - QListViewItem* se = new QListViewItem(m_engines, "KTorrents", "http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0"); + TQListViewItem* se = new TQListViewItem(m_engines, "KTorrents", "http://www.ktorrents.com/search.php?lg=0&sourceid=ktorrent&q=FOOBAR&f=0"); - se = new QListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR"); + se = new TQListViewItem(m_engines, "bittorrent.com", "http://search.bittorrent.com/search.jsp?query=FOOBAR"); - se = new QListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and"); + se = new TQListViewItem(m_engines, "isohunt.com", "http://isohunt.com/torrents.php?ihq=FOOBAR&op=and"); - se = new QListViewItem(m_engines, "mininova.org", "http://www.mininova.org/search.php?search=FOOBAR"); + se = new TQListViewItem(m_engines, "mininova.org", "http://www.mininova.org/search.php?search=FOOBAR"); - se = new QListViewItem(m_engines, "thepiratebay.org", "http://thepiratebay.org/search.php?q=FOOBAR"); + se = new TQListViewItem(m_engines, "thepiratebay.org", "http://thepiratebay.org/search.php?q=FOOBAR"); - se = new QListViewItem(m_engines, "bitoogle.com", "http://bitoogle.com/search.php?q=FOOBAR"); + se = new TQListViewItem(m_engines, "bitoogle.com", "http://bitoogle.com/search.php?q=FOOBAR"); - se = new QListViewItem(m_engines, "bytenova.org", "http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8"); + se = new TQListViewItem(m_engines, "bytenova.org", "http://www.bitenova.org/search.php?search=FOOBAR&start=0&start=0&ie=utf-8&oe=utf-8"); - se = new QListViewItem(m_engines, "torrentspy.com", "http://torrentspy.com/search.asp?query=FOOBAR"); + se = new TQListViewItem(m_engines, "torrentspy.com", "http://torrentspy.com/search.asp?query=FOOBAR"); - se = new QListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR"); + se = new TQListViewItem(m_engines, "torrentz.com", "http://www.torrentz.com/search_FOOBAR"); } void SearchPrefPageWidget::removeAllClicked() @@ -185,7 +185,7 @@ namespace kt void SearchPrefPageWidget::btnUpdate_clicked() { - QString fn = KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp"; + TQString fn = KGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines.tmp"; KURL source("http://www.ktorrent.org/downloads/search_engines"); if (KIO::NetAccess::download(source,fn,NULL)) @@ -197,27 +197,27 @@ namespace kt } } - void SearchPrefPageWidget::updateList(QString& source) + void SearchPrefPageWidget::updateList(TQString& source) { - QFile fptr(source); + TQFile fptr(source); if (!fptr.open(IO_ReadOnly)) return; - QTextStream in(&fptr); + TQTextStream in(&fptr); - QMap<QString,KURL> engines; + TQMap<TQString,KURL> engines; while (!in.atEnd()) { - QString line = in.readLine(); + TQString line = in.readLine(); if(line.startsWith("#") || line.startsWith(" ") || line.isEmpty() ) continue; - QStringList tokens = QStringList::split(" ", line); - QString name = tokens[0]; - name = name.replace("%20"," "); + TQStringList tokens = TQStringList::split(" ", line); + TQString name = tokens[0]; + name = name.tqreplace("%20"," "); KURL url = KURL::fromPathOrURL(tokens[1]); for(Uint32 i=2; i<tokens.count(); ++i) @@ -226,15 +226,15 @@ namespace kt engines.insert(name,url); } - QMap<QString,KURL>::iterator i = engines.begin(); + TQMap<TQString,KURL>::iterator i = engines.begin(); while (i != engines.end()) { - QListViewItem* item = m_engines->findItem(i.key(),0); + TQListViewItem* item = m_engines->tqfindItem(i.key(),0); // if we have found the item, replace it if not make a new one if (item) item->setText(1, i.data().prettyURL()); else - new QListViewItem(m_engines,i.key(),i.data().prettyURL()); + new TQListViewItem(m_engines,i.key(),i.data().prettyURL()); i++; } @@ -264,9 +264,9 @@ namespace kt return ret; } - void SearchPrefPage::createWidget(QWidget* parent) + void SearchPrefPage::createWidget(TQWidget* tqparent) { - widget = new SearchPrefPageWidget(parent); + widget = new SearchPrefPageWidget(tqparent); } void SearchPrefPage::deleteWidget() diff --git a/plugins/search/searchprefpage.h b/plugins/search/searchprefpage.h index a8d647d..748b378 100644 --- a/plugins/search/searchprefpage.h +++ b/plugins/search/searchprefpage.h @@ -24,7 +24,7 @@ #include <interfaces/prefpageinterface.h> #include "searchpref.h" -#include <qstring.h> +#include <tqstring.h> namespace kt { @@ -34,12 +34,13 @@ namespace kt class SearchPrefPageWidget : public SEPreferences { Q_OBJECT + TQ_OBJECT public: - SearchPrefPageWidget(QWidget *parent = 0); + SearchPrefPageWidget(TQWidget *tqparent = 0); bool apply(); void saveSearchEngines(); - void updateList(QString& source); + void updateList(TQString& source); void updateSearchEngines(const SearchEngineList & se); @@ -64,7 +65,7 @@ namespace kt virtual ~SearchPrefPage(); virtual bool apply(); - virtual void createWidget(QWidget* parent); + virtual void createWidget(TQWidget* tqparent); virtual void updateData(); virtual void deleteWidget(); diff --git a/plugins/search/searchtab.cpp b/plugins/search/searchtab.cpp index 1beaa6a..02f3acf 100644 --- a/plugins/search/searchtab.cpp +++ b/plugins/search/searchtab.cpp @@ -17,17 +17,17 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include <qfile.h> -#include <qtextstream.h> -#include <qapplication.h> -#include <qlistbox.h> -#include <qcheckbox.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqapplication.h> +#include <tqlistbox.h> +#include <tqcheckbox.h> #include <kglobal.h> #include <kpushbutton.h> #include <kiconloader.h> #include <kcombobox.h> #include <kcompletion.h> -#include <qlabel.h> +#include <tqlabel.h> #include <klocale.h> #include "searchtab.h" #include "searchenginelist.h" @@ -48,21 +48,21 @@ namespace kt m_search_new_tab = new KPushButton(i18n("Search"),tb); m_search_engine = new KComboBox(tb); - m_clear_button->setIconSet(SmallIconSet(QApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); + m_clear_button->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); m_clear_button->setEnabled(false); - connect(m_search_new_tab,SIGNAL(clicked()),this,SLOT(searchNewTabPressed())); - connect(m_search_text,SIGNAL(returnPressed(const QString&)),this,SLOT(searchBoxReturn( const QString& ))); - connect(m_search_text,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged( const QString& ))); - connect(m_clear_button,SIGNAL(clicked()),this,SLOT(clearButtonPressed())); + connect(m_search_new_tab,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchNewTabPressed())); + connect(m_search_text,TQT_SIGNAL(returnPressed(const TQString&)),this,TQT_SLOT(searchBoxReturn( const TQString& ))); + connect(m_search_text,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged( const TQString& ))); + connect(m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearButtonPressed())); m_search_text->setMaxCount(20); m_search_new_tab->setEnabled(false); - m_search_text->setInsertionPolicy(QComboBox::NoInsertion); + m_search_text->setInsertionPolicy(TQComboBox::NoInsertion); tb->insertWidget(1,-1,m_clear_button); tb->insertWidget(2,-1,m_search_text); tb->insertWidget(3,-1,m_search_new_tab); - tb->insertWidget(4,-1,new QLabel(i18n(" Engine: "),tb)); + tb->insertWidget(4,-1,new TQLabel(i18n(" Engine: "),tb)); tb->insertWidget(5,-1,m_search_engine); loadSearchHistory(); } @@ -93,7 +93,7 @@ namespace kt m_search_engine->setCurrentItem(ci); } - void SearchTab::searchBoxReturn(const QString & str) + void SearchTab::searchBoxReturn(const TQString & str) { KCompletion *comp = m_search_text->completionObject(); if (!m_search_text->contains(str)) @@ -116,7 +116,7 @@ namespace kt searchBoxReturn(m_search_text->currentText()); } - void SearchTab::textChanged(const QString & str) + void SearchTab::textChanged(const TQString & str) { m_search_new_tab->setEnabled(str.length() > 0); m_clear_button->setEnabled(str.length() > 0); @@ -124,17 +124,17 @@ namespace kt void SearchTab::loadSearchHistory() { - QFile fptr(kt::DataDir() + "search_history"); + TQFile fptr(kt::DataDir() + "search_history"); if (!fptr.open(IO_ReadOnly)) return; KCompletion *comp = m_search_text->completionObject(); Uint32 cnt = 0; - QTextStream in(&fptr); + TQTextStream in(&fptr); while (!in.atEnd() && cnt < 50) { - QString line = in.readLine(); + TQString line = in.readLine(); if (line.isNull()) break; @@ -151,14 +151,14 @@ namespace kt void SearchTab::saveSearchHistory() { - QFile fptr(kt::DataDir() + "search_history"); + TQFile fptr(kt::DataDir() + "search_history"); if (!fptr.open(IO_WriteOnly)) return; - QTextStream out(&fptr); + TQTextStream out(&fptr); KCompletion *comp = m_search_text->completionObject(); - QStringList items = comp->items(); - for (QStringList::iterator i = items.begin();i != items.end();i++) + TQStringList items = comp->items(); + for (TQStringList::iterator i = items.begin();i != items.end();i++) { out << *i << endl; } diff --git a/plugins/search/searchtab.h b/plugins/search/searchtab.h index c392de9..9c62bf3 100644 --- a/plugins/search/searchtab.h +++ b/plugins/search/searchtab.h @@ -33,9 +33,10 @@ namespace kt /** Holds all widgets of the toolbar of the search plugin. */ - class SearchTab : public QObject + class SearchTab : public TQObject { Q_OBJECT + TQ_OBJECT public: SearchTab(KToolBar* toolbar); @@ -53,12 +54,12 @@ namespace kt protected slots: void clearButtonPressed(); void searchNewTabPressed(); - void searchBoxReturn(const QString & str); - void textChanged(const QString & str); + void searchBoxReturn(const TQString & str); + void textChanged(const TQString & str); signals: /// Emitted when the user presses enter or clicks search - void search(const QString & text,int engine,bool external); + void search(const TQString & text,int engine,bool external); private: void loadSearchHistory(); diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index 2ed19e8..b7e2627 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -21,11 +21,11 @@ #include <kapplication.h> #include <khtmlview.h> -#include <qlayout.h> -#include <qfile.h> -#include <qtextstream.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqtextstream.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <klineedit.h> #include <kpushbutton.h> #include <kglobal.h> @@ -59,55 +59,55 @@ namespace kt SearchWidget::SearchWidget(SearchPlugin* sp) : html_part(0),sp(sp) { - QVBoxLayout* layout = new QVBoxLayout(this); - layout->setAutoAdd(true); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this); + tqlayout->setAutoAdd(true); sbar = new SearchBar(this); html_part = new HTMLPart(this); right_click_menu = new KPopupMenu(this); right_click_menu->insertSeparator(); back_id = right_click_menu->insertItem( - KGlobal::iconLoader()->loadIconSet(QApplication::reverseLayout() + KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "forward" : "back",KIcon::Small), - i18n("Back"),html_part,SLOT(back())); + i18n("Back"),html_part,TQT_SLOT(back())); right_click_menu->insertItem( KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small), - i18n("Reload"),html_part,SLOT(reload())); + i18n("Reload"),html_part,TQT_SLOT(reload())); right_click_menu->setItemEnabled(back_id,false); sbar->m_back->setEnabled(false); - connect(sbar->m_search_button,SIGNAL(clicked()),this,SLOT(searchPressed())); - connect(sbar->m_clear_button,SIGNAL(clicked()),this,SLOT(clearPressed())); - connect(sbar->m_search_text,SIGNAL(returnPressed()),this,SLOT(searchPressed())); - connect(sbar->m_back,SIGNAL(clicked()),html_part,SLOT(back())); - connect(sbar->m_reload,SIGNAL(clicked()),html_part,SLOT(reload())); + connect(sbar->m_search_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchPressed())); + connect(sbar->m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearPressed())); + connect(sbar->m_search_text,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchPressed())); + connect(sbar->m_back,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(back())); + connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload())); sbar->m_clear_button->setIconSet( - KGlobal::iconLoader()->loadIconSet(QApplication::reverseLayout() + KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",KIcon::Small)); sbar->m_back->setIconSet( - KGlobal::iconLoader()->loadIconSet(QApplication::reverseLayout() + KGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "forward" : "back", KIcon::Small)); sbar->m_reload->setIconSet( KGlobal::iconLoader()->loadIconSet("reload",KIcon::Small)); - connect(html_part,SIGNAL(backAvailable(bool )), - this,SLOT(onBackAvailable(bool ))); - connect(html_part,SIGNAL(onURL(const QString& )), - this,SLOT(onURLHover(const QString& ))); - connect(html_part,SIGNAL(openTorrent(const KURL& )), - this,SLOT(onOpenTorrent(const KURL& ))); - connect(html_part,SIGNAL(popupMenu(const QString&, const QPoint& )), - this,SLOT(showPopupMenu(const QString&, const QPoint& ))); - connect(html_part,SIGNAL(searchFinished()),this,SLOT(onFinished())); - connect(html_part,SIGNAL(saveTorrent(const KURL& )), - this,SLOT(onSaveTorrent(const KURL& ))); + connect(html_part,TQT_SIGNAL(backAvailable(bool )), + this,TQT_SLOT(onBackAvailable(bool ))); + connect(html_part,TQT_SIGNAL(onURL(const TQString& )), + this,TQT_SLOT(onURLHover(const TQString& ))); + connect(html_part,TQT_SIGNAL(openTorrent(const KURL& )), + this,TQT_SLOT(onOpenTorrent(const KURL& ))); + connect(html_part,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), + this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); + connect(html_part,TQT_SIGNAL(searchFinished()),this,TQT_SLOT(onFinished())); + connect(html_part,TQT_SIGNAL(saveTorrent(const KURL& )), + this,TQT_SLOT(onSaveTorrent(const KURL& ))); KParts::PartManager* pman = html_part->partManager(); - connect(pman,SIGNAL(partAdded(KParts::Part*)),this,SLOT(onFrameAdded(KParts::Part* ))); + connect(pman,TQT_SIGNAL(partAdded(KParts::Part*)),this,TQT_SLOT(onFrameAdded(KParts::Part* ))); - connect(html_part->browserExtension(),SIGNAL(loadingProgress(int)),this,SLOT(loadingProgress(int))); + connect(html_part->browserExtension(),TQT_SIGNAL(loadingProgress(int)),this,TQT_SLOT(loadingProgress(int))); prog = 0; } @@ -143,8 +143,8 @@ namespace kt KHTMLPart* frame = dynamic_cast<KHTMLPart*>(p); if (frame) { - connect(frame,SIGNAL(popupMenu(const QString&, const QPoint& )), - this,SLOT(showPopupMenu(const QString&, const QPoint& ))); + connect(frame,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), + this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); } } @@ -155,7 +155,7 @@ namespace kt html_part->copy(); } - void SearchWidget::search(const QString & text,int engine) + void SearchWidget::search(const TQString & text,int engine) { if (!html_part) return; @@ -171,11 +171,11 @@ namespace kt if (engine < 0 || (Uint32)engine >= sl.getNumEngines()) engine = sbar->m_search_engine->currentItem(); - QString s_url = sl.getSearchURL(engine).prettyURL(); - s_url.replace("FOOBAR", KURL::encode_string(text), true); + TQString s_url = sl.getSearchURL(engine).prettyURL(); + s_url.tqreplace("FOOBAR", KURL::encode_string(text), true); KURL url = KURL::fromPathOrURL(s_url); - statusBarMsg(i18n("Searching for %1...").arg(text)); + statusBarMsg(i18n("Searching for %1...").tqarg(text)); //html_part->openURL(url); html_part->openURLRequest(url,KParts::URLArgs()); } @@ -190,7 +190,7 @@ namespace kt sbar->m_search_text->clear(); } - void SearchWidget::onURLHover(const QString & url) + void SearchWidget::onURLHover(const TQString & url) { statusBarMsg(url); } @@ -206,10 +206,10 @@ namespace kt void SearchWidget::onSaveTorrent(const KURL & url) { - KFileDialog fdlg(QString::null,"*.torrent | " + i18n("torrent files"),this,0,true); + KFileDialog fdlg(TQString(),"*.torrent | " + i18n("torrent files"),this,0,true); fdlg.setSelection(url.fileName()); fdlg.setOperationMode(KFileDialog::Saving); - if (fdlg.exec() == QDialog::Accepted) + if (fdlg.exec() == TQDialog::Accepted) { KURL save_url = fdlg.selectedURL(); // start a copy job @@ -219,7 +219,7 @@ namespace kt } } - void SearchWidget::showPopupMenu(const QString & url,const QPoint & p) + void SearchWidget::showPopupMenu(const TQString & url,const TQPoint & p) { right_click_menu->popup(p); } @@ -235,7 +235,7 @@ namespace kt html_part = 0; } - void SearchWidget::statusBarMsg(const QString & url) + void SearchWidget::statusBarMsg(const TQString & url) { sp->getGUI()->changeStatusbar(url); } diff --git a/plugins/search/searchwidget.h b/plugins/search/searchwidget.h index 36fb73e..fc03a06 100644 --- a/plugins/search/searchwidget.h +++ b/plugins/search/searchwidget.h @@ -20,8 +20,8 @@ #ifndef BTSEARCHWIDGET_H #define BTSEARCHWIDGET_H -#include <qwidget.h> -#include <qvaluevector.h> +#include <tqwidget.h> +#include <tqvaluevector.h> #include <kurl.h> class SearchBar; @@ -45,9 +45,10 @@ namespace kt Widget which shows a KHTML window with the users search in it */ - class SearchWidget : public QWidget + class SearchWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: SearchWidget(SearchPlugin* sp); virtual ~SearchWidget(); @@ -57,21 +58,21 @@ namespace kt void updateSearchEngines(const SearchEngineList & sl); public slots: - void search(const QString & text,int engine = 0); + void search(const TQString & text,int engine = 0); void copy(); void onShutDown(); private slots: void searchPressed(); void clearPressed(); - void onURLHover(const QString & url); + void onURLHover(const TQString & url); void onFinished(); void onOpenTorrent(const KURL & url); void onSaveTorrent(const KURL & url); - void showPopupMenu(const QString & s,const QPoint & p); + void showPopupMenu(const TQString & s,const TQPoint & p); void onBackAvailable(bool available); void onFrameAdded(KParts::Part* p); - void statusBarMsg(const QString & url); + void statusBarMsg(const TQString & url); void openTorrent(const KURL & url); void loadingProgress(int perc); |