diff options
Diffstat (limited to 'katapult/plugins/catalogs/bookmarkcatalog')
9 files changed, 77 insertions, 74 deletions
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp index bd31782..4eda633 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp @@ -25,20 +25,20 @@ #include <kurl.h> #include <klocale.h> -#include <qstring.h> -#include <qpixmap.h> +#include <tqstring.h> +#include <tqpixmap.h> #include "actionopenbookmark.h" #include "katapultitem.h" #include "bookmark.h" #include "mozillabookmark.h" -QPixmap ActionOpenBookmark::icon(int size) const +TQPixmap ActionOpenBookmark::icon(int size) const { return KGlobal::iconLoader()->loadIcon("fileopen", KIcon::NoGroup, size); } -QString ActionOpenBookmark::text() const +TQString ActionOpenBookmark::text() const { return i18n("Open Bookmark"); } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h index 9068753..61dc33e 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.h @@ -23,8 +23,8 @@ #include <katapultaction.h> class KatapultItem; -class QPixmap; -class QString; +class TQPixmap; +class TQString; /** @author Joe Ferris @@ -33,8 +33,8 @@ class ActionOpenBookmark : public KatapultAction { public: - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; virtual void execute(const KatapultItem *) const; virtual bool accepts(const KatapultItem *) const; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp index e5d65db..ae098f3 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp @@ -30,7 +30,7 @@ Bookmark::Bookmark(KBookmark _bookmark) this->_bookmark = _bookmark; } -QPixmap Bookmark::icon(int size) const +TQPixmap Bookmark::icon(int size) const { return KGlobal::iconLoader()->loadIcon(_bookmark.icon(), KIcon::NoGroup, size); } @@ -40,7 +40,7 @@ KBookmark Bookmark::bookmark() const return _bookmark; } -QString Bookmark::text() const +TQString Bookmark::text() const { return _bookmark.text(); } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h index fba7fec..f86b341 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.h @@ -30,11 +30,12 @@ class Bookmark : public KatapultItem { Q_OBJECT + TQ_OBJECT public: Bookmark(KBookmark); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; KBookmark bookmark() const; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp index e70d65f..0fae37d 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.cpp @@ -27,12 +27,12 @@ #include <knuminput.h> #include <kurlrequester.h> -#include <qstring.h> -#include <qradiobutton.h> -#include <qbuttongroup.h> -#include <qdir.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqstring.h> +#include <tqradiobutton.h> +#include <tqbuttongroup.h> +#include <tqdir.h> +#include <tqregexp.h> +#include <tqfile.h> #include "bookmarkcatalog.h" #include "bookmark.h" @@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( katapult_bookmarkcatalog, KGenericFactory<BookmarkCatalog>( "katapult_bookmarkcatalog" ) ) -BookmarkCatalog::BookmarkCatalog(QObject *, const char *, const QStringList&) +BookmarkCatalog::BookmarkCatalog(TQObject *, const char *, const TQStringList&) : CachedCatalog() { manager = KBookmarkManager::userBookmarksManager(); @@ -86,34 +86,34 @@ void BookmarkCatalog::cacheMozillaBookmarks() if(_mozFile.isEmpty()) return; - QFile bmFile(_mozFile); + TQFile bmFile(_mozFile); if(!bmFile.open(IO_ReadOnly)) return; - QString contents = bmFile.readAll(); - QRegExp rx("<A HREF=\"([^\"]+)\" [^>]+>([^<]+)</A>"); + TQString contents = bmFile.readAll(); + TQRegExp rx("<A HREF=\"([^\"]+)\" [^>]+>([^<]+)</A>"); int pos = 0; while(pos > -1) { pos = rx.search(contents, pos); if(pos > -1) { - addItem(new MozillaBookmark(rx.cap(1), rx.cap(2), QPixmap())); + addItem(new MozillaBookmark(rx.cap(1), rx.cap(2), TQPixmap())); pos += rx.matchedLength(); } } } -QString BookmarkCatalog::detectMozillaFile() +TQString BookmarkCatalog::detectMozillaFile() { - QStringList testDirs; + TQStringList testDirs; testDirs << ".firefox" << ".mozilla" << ".phoenix" << ".netscape"; - QDir home = QDir::home(); - for(QStringList::Iterator it = testDirs.begin(); it != testDirs.end(); ++it) { - QString testDir = *it; + TQDir home = TQDir::home(); + for(TQStringList::Iterator it = testDirs.begin(); it != testDirs.end(); ++it) { + TQString testDir = *it; if(home.exists(testDir)) { - QDir mozDir = QDir(home.path()+"/"+testDir).canonicalPath(); - if(mozDir.dirName() != testDir && testDirs.contains(mozDir.dirName())) + TQDir mozDir = TQDir(home.path()+"/"+testDir).canonicalPath(); + if(mozDir.dirName() != testDir && testDirs.tqcontains(mozDir.dirName())) continue; - QString path = searchMozDir(mozDir.path()); + TQString path = searchMozDir(mozDir.path()); if(!path.isEmpty()) return path; } @@ -122,21 +122,21 @@ QString BookmarkCatalog::detectMozillaFile() return ""; } -QString BookmarkCatalog::searchMozDir(QString path) +TQString BookmarkCatalog::searchMozDir(TQString path) { - QDir dir(path); + TQDir dir(path); if(dir.exists("bookmarks.html")) { return path+"/bookmarks.html"; } - QStringList entries = dir.entryList(QDir::Dirs | QDir::NoSymLinks); - for(QStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { + TQStringList entries = dir.entryList(TQDir::Dirs | TQDir::NoSymLinks); + for(TQStringList::Iterator it = entries.begin(); it != entries.end(); ++it) { if(*it != "." && *it != ".."){ - QString result = searchMozDir(path + "/" + *it); + TQString result = searchMozDir(path + "/" + *it); if(!result.isEmpty()) return result; } } - return QString::null; + return TQString(); } unsigned int BookmarkCatalog::minQueryLen() const @@ -160,23 +160,23 @@ void BookmarkCatalog::writeSettings(KConfigBase *config) config->writeEntry("MozFile", _mozFile); } -QWidget * BookmarkCatalog::configure() +TQWidget * BookmarkCatalog::configure() { settings = new BookmarkCatalogSettings(); settings->minQueryLen->setValue(_minQueryLen); - connect(settings->minQueryLen, SIGNAL(valueChanged(int)), this, SLOT(minQueryLenChanged(int))); + connect(settings->minQueryLen, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(minQueryLenChanged(int))); settings->mozEnabled->setChecked(_mozEnabled); - connect(settings->mozEnabled, SIGNAL(toggled(bool)), this, SLOT(toggleMozEnabled(bool))); + connect(settings->mozEnabled, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleMozEnabled(bool))); settings->mozAuto->setChecked(_mozAuto); - connect(settings->mozAuto, SIGNAL(toggled(bool)), this, SLOT(toggleMozAuto(bool))); + connect(settings->mozAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleMozAuto(bool))); settings->mozManual->setChecked(!_mozAuto); settings->mozFile->setURL(_mozFile); - connect(settings->mozFile, SIGNAL(urlSelected(const QString &)), this, SLOT(changeMozFile(const QString &))); + connect(settings->mozFile, TQT_SIGNAL(urlSelected(const TQString &)), this, TQT_SLOT(changeMozFile(const TQString &))); settings->mozAuto->setEnabled(_mozEnabled); settings->mozManual->setEnabled(_mozEnabled); @@ -204,7 +204,7 @@ void BookmarkCatalog::toggleMozAuto(bool _mozAuto) settings->mozFile->setEnabled(!_mozAuto); } -void BookmarkCatalog::changeMozFile(const QString & _mozFile) +void BookmarkCatalog::changeMozFile(const TQString & _mozFile) { this->_mozFile = _mozFile; } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h index b0e5736..190a866 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmarkcatalog.h @@ -22,12 +22,12 @@ #include <kgenericfactory.h> -#include <qptrlist.h> +#include <tqptrlist.h> #include "cachedcatalog.h" -class QWidget; -class QString; +class TQWidget; +class TQString; class KBookmarkManager; class KBookmarkGroup; class BookmarkCatalogSettings; @@ -38,33 +38,34 @@ class BookmarkCatalogSettings; class BookmarkCatalog : public CachedCatalog { Q_OBJECT + TQ_OBJECT public: - BookmarkCatalog(QObject *, const char *, const QStringList&); + BookmarkCatalog(TQObject *, const char *, const TQStringList&); virtual ~BookmarkCatalog(); virtual void initialize(); virtual void readSettings(KConfigBase *); virtual void writeSettings(KConfigBase *); virtual unsigned int minQueryLen() const; - virtual QWidget * configure(); + virtual TQWidget * configure(); public slots: void minQueryLenChanged(int); void toggleMozEnabled(bool); void toggleMozAuto(bool); - void changeMozFile(const QString &); - QString searchMozDir(QString); + void changeMozFile(const TQString &); + TQString searchMozDir(TQString); private: void cacheBookmarkList(KBookmarkGroup); void cacheMozillaBookmarks(); - QString detectMozillaFile(); + TQString detectMozillaFile(); KBookmarkManager *manager; int _minQueryLen; bool _mozEnabled; bool _mozAuto; - QString _mozFile; + TQString _mozFile; BookmarkCatalogSettings *settings; }; diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp index eb55751..4a67681 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp +++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp @@ -21,11 +21,11 @@ #include <kiconloader.h> #include <kglobal.h> -#include <qpixmap.h> +#include <tqpixmap.h> #include "mozillabookmark.h" -MozillaBookmark::MozillaBookmark(QString _url, QString _title, QPixmap _icon) +MozillaBookmark::MozillaBookmark(TQString _url, TQString _title, TQPixmap _icon) : KatapultItem() { this->_url = _url; @@ -33,17 +33,17 @@ MozillaBookmark::MozillaBookmark(QString _url, QString _title, QPixmap _icon) this->_title = _title; } -QPixmap MozillaBookmark::icon(int size) const +TQPixmap MozillaBookmark::icon(int size) const { return KGlobal::iconLoader()->loadIcon("bookmark", KIcon::NoGroup, size); } -QString MozillaBookmark::url() const +TQString MozillaBookmark::url() const { return _url; } -QString MozillaBookmark::text() const +TQString MozillaBookmark::text() const { return _title; } diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h index f1e25fb..07dc034 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h +++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.h @@ -20,7 +20,7 @@ #ifndef MOZILLABOOKMARK_H #define MOZILLABOOKMARK_H -#include <qpixmap.h> +#include <tqpixmap.h> #include "katapultitem.h" @@ -30,17 +30,18 @@ class MozillaBookmark : public KatapultItem { Q_OBJECT + TQ_OBJECT public: - MozillaBookmark(QString, QString, QPixmap); + MozillaBookmark(TQString, TQString, TQPixmap); - virtual QPixmap icon(int) const; - virtual QString text() const; + virtual TQPixmap icon(int) const; + virtual TQString text() const; - QString url() const; + TQString url() const; private: - QString _url, _title; - QPixmap _icon; + TQString _url, _title; + TQPixmap _icon; }; #endif diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui index 7a8121d..6f35eae 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui +++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>BookmarkCatalogSettings</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>BookmarkCatalogSettings</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,15 +19,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -51,7 +51,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>mozEnabled</cstring> </property> @@ -65,7 +65,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mozAuto</cstring> </property> @@ -73,7 +73,7 @@ <string>Automatically detect bookmark file</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>mozManual</cstring> </property> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> @@ -107,7 +107,7 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>kurlrequester.h</includehint> |