TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

11 files changed, 40 insertions, 35 deletions

diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp
index dd038b6..5fbc533 100644
--- a/konq-plugins/sidebar/newsticker/configfeeds.cpp
+++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp
@@ -29,7 +29,7 @@
 
 namespace KSB_News {
 
-ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name)
+ConfigFeeds::ConfigFeeds(TQWidget* tqparent, const char* name) : ConfigFeedsBase(tqparent, name)
 {
 }
 
diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h
index 127ba27..5ca80a7 100644
--- a/konq-plugins/sidebar/newsticker/configfeeds.h
+++ b/konq-plugins/sidebar/newsticker/configfeeds.h
@@ -41,9 +41,10 @@ namespace KSB_News {
   class ConfigFeeds : public ConfigFeedsBase {
 
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    ConfigFeeds(TQWidget* parent,  const char* name = 0);
+    ConfigFeeds(TQWidget* tqparent,  const char* name = 0);
 
   };
 
diff --git a/konq-plugins/sidebar/newsticker/configfeedsbase.ui b/konq-plugins/sidebar/newsticker/configfeedsbase.ui
index 8389747..594e72b 100644
--- a/konq-plugins/sidebar/newsticker/configfeedsbase.ui
+++ b/konq-plugins/sidebar/newsticker/configfeedsbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ConfigFeedsBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ConfigFeedsBase</cstring>
     </property>
@@ -18,7 +18,7 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="0"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
 <includehints>
     <includehint>keditlistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index db793bd..35ee14d 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -37,17 +37,17 @@
 
 namespace KSB_News {
 
-  NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name)
-    : TQWidget(parent, name) {
+  NoRSSWidget::NoRSSWidget(TQWidget *tqparent, const char *name)
+    : TQWidget(tqparent, name) {
 
     TQVBoxLayout *topLayout = new TQVBoxLayout(this);
 
     topLayout->addStretch();
 
     KPushButton *btn = new KPushButton(i18n("&Configure"), this);
-    btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
+    btn->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum);
     connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked()));
-    topLayout->addWidget(btn, 0, Qt::AlignHCenter);
+    topLayout->addWidget(btn, 0, TQt::AlignHCenter);
 
     topLayout->addStretch();
   }
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h
index 91a8c61..70ee265 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.h
+++ b/konq-plugins/sidebar/newsticker/norsswidget.h
@@ -33,9 +33,10 @@ namespace KSB_News {
 
   class NoRSSWidget : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NoRSSWidget(TQWidget *parent = 0, const char *name = 0);
+    NoRSSWidget(TQWidget *tqparent = 0, const char *name = 0);
 
   private slots:
     void slotBtnClicked();
diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index a5c1261..e58d0c4 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -35,8 +35,8 @@ namespace KSB_News {
 ////////////////////////////////////////////////////////////////
 // ListBox including ToolTip for item
 ////////////////////////////////////////////////////////////////
-  TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f)
-    : KListBox(parent, name, f),
+  TTListBox::TTListBox(TQWidget *tqparent, const char *name, WFlags f)
+    : KListBox(tqparent, name, f),
       TQToolTip(this) {
   }
 
@@ -54,16 +54,16 @@ namespace KSB_News {
         int textWidth = fm.width(text);
         int widgetSpace = visibleWidth();
         if ((textWidth > widgetSpace) || (contentsX() > 0))
-          tip(itemRect(item), text);
+          tip(tqitemRect(item), text);
       }
     }
   }
 
 
 
-  NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key,
+  NSPanel::NSPanel(TQObject *tqparent, const char *name, const TQString &key,
                    DCOPRef *rssservice)
-    :TQObject(parent, name)
+    :TQObject(tqparent, name)
     ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1())
     ,m_listbox()
     ,m_pixmap()
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index d46be5b..01cf1e2 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -44,7 +44,7 @@ namespace KSB_News {
 ////////////////////////////////////////////////////////////////
   class TTListBox : public KListBox, TQToolTip {
   public:
-    TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
+    TTListBox (TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0);
     void clear();
 
   protected:
@@ -55,10 +55,11 @@ namespace KSB_News {
 
   class NSPanel : public TQObject, public DCOPObject {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
   public:
-    NSPanel(TQObject *parent, const char *name, const TQString &key,
+    NSPanel(TQObject *tqparent, const char *name, const TQString &key,
             DCOPRef *rssservice);
     ~NSPanel();
 
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 6c7e44b..9c29b7c 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -50,10 +50,10 @@
 
 namespace KSB_News {
 
-  NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name,
-                                     TQPixmap appIcon) : TQWidget(parent, name) {
+  NSStackTabWidget::NSStackTabWidget(TQWidget *tqparent, const char *name,
+                                     TQPixmap appIcon) : TQWidget(tqparent, name) {
     currentPage = 0;
-    layout = new TQVBoxLayout(this);
+    tqlayout = new TQVBoxLayout(this);
 
     pagesheader.setAutoDelete(TRUE);
     pages.setAutoDelete(TRUE);
@@ -115,7 +115,7 @@ namespace KSB_News {
     button->setText(KStringHandler::rPixelSqueeze(nsp->title(),
                                                   button->fontMetrics(),
                                                   button->width() - 4 ));
-    button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+    button->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
                                       TQSizePolicy::Preferred));
     connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked()));
     TQToolTip::add(button, nsp->title());
@@ -132,8 +132,8 @@ namespace KSB_News {
     pagesheader.insert(nsp, button);
     pages.insert(nsp, sv);
 
-    layout->addWidget(button);
-    layout->addWidget(sv);
+    tqlayout->addWidget(button);
+    tqlayout->addWidget(sv);
     button->show();
     if (pages.count() == 1) {
       currentPage = sv;
@@ -161,7 +161,7 @@ namespace KSB_News {
 
 
   void NSStackTabWidget::updateTitle(NSPanel *nsp) {
-    TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp);
+    TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp);
     if (! pb->pixmap())
       pb->setText(nsp->title());
   }
@@ -169,11 +169,11 @@ namespace KSB_News {
 
 
   void NSStackTabWidget::updatePixmap(NSPanel *nsp) {
-    TQPushButton *pb = (TQPushButton *)pagesheader.find(nsp);
+    TQPushButton *pb = (TQPushButton *)pagesheader.tqfind(nsp);
     TQPixmap pixmap = nsp->pixmap();
     if ((pixmap.width() > 88) || (pixmap.height() > 31)) {
       TQImage image = pixmap.convertToImage();
-      pixmap.convertFromImage(image.smoothScale(88, 31, TQImage::ScaleMin));
+      pixmap.convertFromImage(image.smoothScale(88, 31, TQ_ScaleMin));
     }
     pb->setPixmap(pixmap);
   }
@@ -197,7 +197,7 @@ namespace KSB_News {
       return;
 
     // Find current ScrollView
-    TQWidget *sv = pages.find(nsp);
+    TQWidget *sv = pages.tqfind(nsp);
 
     // Change visible page
     if (currentPage != sv) {
@@ -213,7 +213,7 @@ namespace KSB_News {
 
   bool NSStackTabWidget::eventFilter(TQObject *obj, TQEvent *ev) {
     if (ev->type() == TQEvent::MouseButtonPress
-        && ((TQMouseEvent *)ev)->button() == TQMouseEvent::RightButton) {
+        && ((TQMouseEvent *)ev)->button() == Qt::RightButton) {
       m_last_button_rightclicked = (TQPushButton *)obj;
       popup->exec(TQCursor::pos());
       return true;
@@ -352,7 +352,7 @@ namespace KSB_News {
 
   bool NSStackTabWidget::isRegistered(const TQString &key) {
     m_our_rsssources = SidebarSettings::sources();
-    if (m_our_rsssources.findIndex(key) == -1)
+    if (m_our_rsssources.tqfindIndex(key) == -1)
       return false;
     else
       return true;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index cf001a0..49650e7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -47,9 +47,10 @@ namespace KSB_News {
 
   class NSStackTabWidget : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-    NSStackTabWidget(TQWidget *parent = 0, const char *name = 0,
+    NSStackTabWidget(TQWidget *tqparent = 0, const char *name = 0,
                      TQPixmap appIcon = TQPixmap());
     void addStackTab(NSPanel *nsp, TQWidget *page);
     void delStackTab(NSPanel *nsp);
@@ -73,7 +74,7 @@ namespace KSB_News {
   private:
     TQPtrDict<TQWidget> pages;
     TQPtrDict<TQWidget> pagesheader;
-    TQVBoxLayout *layout;
+    TQVBoxLayout *tqlayout;
     TQWidget *currentPage;
     KPopupMenu *popup, *helpmenu;
     KAboutData *m_aboutdata;
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index ae9c51b..97f24e3 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -46,15 +46,15 @@
 
 namespace KSB_News {
 
-  KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent,
+  KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *tqparent,
                                      TQWidget *widgetParent,
                                      TQString &desktopName, const char* name)
-    : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name),
+    : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name),
       DCOPObject("sidebar-newsticker")
   {
     // get the application icon
     // FIXME: as konqueror knows the icon there might be a possibility to
-    //        access the already present QPixmap
+    //        access the already present TQPixmap
     KDesktopFile desktopFile(desktopName, true);
     TQString iconName = desktopFile.readIcon();
     KIconLoader iconLoader;
@@ -191,7 +191,7 @@ namespace KSB_News {
 
     if (NSPanel *nsp = getNSPanelByKey(key)) {
       newswidget->delStackTab(nsp);
-      delete nspanelptrlist.take(nspanelptrlist.findRef(nsp));
+      delete nspanelptrlist.take(nspanelptrlist.tqfindRef(nsp));
     } else
       kdWarning() << "removedSource called for non-existing id" << endl;
 
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h
index b40dcab..1c92c0e 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.h
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.h
@@ -44,10 +44,11 @@ namespace KSB_News {
 
   class KonqSidebar_News : public KonqSidebarPlugin, DCOPObject {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
   public:
-    KonqSidebar_News(KInstance *instance, TQObject *parent,
+    KonqSidebar_News(KInstance *instance, TQObject *tqparent,
                      TQWidget *widgetParent, TQString &desktopName_,
                      const char* name=0);
     ~KonqSidebar_News();