diff options
Diffstat (limited to 'konq-plugins/akregator')
-rw-r--r-- | konq-plugins/akregator/akregatorplugin.cpp | 16 | ||||
-rw-r--r-- | konq-plugins/akregator/akregatorplugin.h | 1 | ||||
-rw-r--r-- | konq-plugins/akregator/feeddetector.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/akregator/feeddetector.h | 4 | ||||
-rw-r--r-- | konq-plugins/akregator/konqfeedicon.cpp | 14 | ||||
-rw-r--r-- | konq-plugins/akregator/konqfeedicon.h | 11 | ||||
-rw-r--r-- | konq-plugins/akregator/pluginbase.cpp | 4 | ||||
-rw-r--r-- | konq-plugins/akregator/pluginbase.h | 4 |
8 files changed, 30 insertions, 28 deletions
diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 2f59adc..4402cd4 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -65,8 +65,8 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const KHTMLView* view = 0L; - if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("KHTMLView")) - view = static_cast<KHTMLView*>(popupmenu->parent()); + if (popupmenu && popupmenu->tqparent() && popupmenu->tqparent()->inherits("KHTMLView")) + view = static_cast<KHTMLView*>(TQT_TQWIDGET(popupmenu->tqparent())); if (view) m_part = view->part(); @@ -85,7 +85,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); - addAction( action ); + tqaddAction( action ); addSeparator(); m_feedURL = it->url().url(); break; @@ -103,16 +103,16 @@ AkregatorMenu::~AkregatorMenu() bool AkregatorMenu::isFeedUrl(const TQString &url) { - if (url.contains(".htm", false) != 0) return false; - if (url.contains("rss", false) != 0) return true; - if (url.contains("rdf", false) != 0) return true; - if (url.contains("xml", false) != 0) return true; + if (url.tqcontains(".htm", false) != 0) return false; + if (url.tqcontains("rss", false) != 0) return true; + if (url.tqcontains("rdf", false) != 0) return true; + if (url.tqcontains("xml", false) != 0) return true; return false; } bool AkregatorMenu::isFeedUrl(const KFileItem * item) { - if ( m_feedMimeTypes.contains( item->mimetype() ) ) + if ( m_feedMimeTypes.tqcontains( item->mimetype() ) ) return true; else { diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h index 9fb6787..4c03dee 100644 --- a/konq-plugins/akregator/akregatorplugin.h +++ b/konq-plugins/akregator/akregatorplugin.h @@ -36,6 +36,7 @@ namespace Akregator class AkregatorMenu : public KonqPopupMenuPlugin, PluginBase { Q_OBJECT + TQ_OBJECT public: AkregatorMenu( KonqPopupMenu *, const char *name, const TQStringList &list ); virtual ~AkregatorMenu(); diff --git a/konq-plugins/akregator/feeddetector.cpp b/konq-plugins/akregator/feeddetector.cpp index 57a333c..595f871 100644 --- a/konq-plugins/akregator/feeddetector.cpp +++ b/konq-plugins/akregator/feeddetector.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqregexp.h> diff --git a/konq-plugins/akregator/feeddetector.h b/konq-plugins/akregator/feeddetector.h index 346663d..ccec4d7 100644 --- a/konq-plugins/akregator/feeddetector.h +++ b/konq-plugins/akregator/feeddetector.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef AKREGATORFEEDDETECTOR_H diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index ce6f89e..a1b993e 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "konqfeedicon.h" @@ -55,12 +55,12 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory; K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) -KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) - : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) +KonqFeedIcon::KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("akregator_konqplugin"); - m_part = dynamic_cast<KHTMLPart*>(parent); + m_part = dynamic_cast<KHTMLPart*>(tqparent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); @@ -110,7 +110,7 @@ bool KonqFeedIcon::feedFound() for (unsigned int j = 0; j < node.attributes().length(); j++) { doc += node.attributes().item(j).nodeName().string() + "=\""; - doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).replace("\"", """); + doc += TQStyleSheet::escape(node.attributes().item(j).nodeValue().string()).tqreplace("\"", """); doc += "\" "; } doc += "/>"; @@ -156,7 +156,7 @@ void KonqFeedIcon::addFeedIcon() // from khtmlpart's ualabel m_feedIcon->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); - m_feedIcon->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_feedIcon->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_feedIcon->setUseCursor(false); //FIXME hackish m_feedIcon->setPixmap(TQPixmap(locate("data", "akregator/pics/rss.png"))); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index 0ac19f0..1dcadcd 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ -#ifndef KONQFEEDICON_H -#define KONQFEEDICON_H +#ifndef KONTQFEEDICON_H +#define KONTQFEEDICON_H #include <tqguardedptr.h> #include <kparts/plugin.h> @@ -46,8 +46,9 @@ namespace Akregator { class KonqFeedIcon : public KParts::Plugin, PluginBase { Q_OBJECT + TQ_OBJECT public: - KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &); + KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &); ~KonqFeedIcon(); diff --git a/konq-plugins/akregator/pluginbase.cpp b/konq-plugins/akregator/pluginbase.cpp index f837426..c0ade83 100644 --- a/konq-plugins/akregator/pluginbase.cpp +++ b/konq-plugins/akregator/pluginbase.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kurl.h> diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h index 1c1d4e6..64e1853 100644 --- a/konq-plugins/akregator/pluginbase.h +++ b/konq-plugins/akregator/pluginbase.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PLUGINBASE_H |