Minor compilation enhancements

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

13 files changed, 36 insertions, 33 deletions

diff --git a/kcontrol/input/core/themepage.h b/kcontrol/input/core/themepage.h
index 646354d91..f27ab3eb3 100644
--- a/kcontrol/input/core/themepage.h
+++ b/kcontrol/input/core/themepage.h
@@ -19,12 +19,15 @@
 #ifndef __THEMEPAGE_H
 #define __THEMEPAGE_H
 
+#include <tqwidget.h>
+
 class KListView;
 class TQListViewItem;
 
 class ThemePage : public TQWidget
 {
 	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ThemePage( TQWidget* parent = 0, const char* name = 0 );
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 18c8fbacc..c25f7e0ef 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -99,7 +99,7 @@
     </vbox>
 </widget>
 <Q_SLOTS>
-    <slot access="protected" specifier="pure virtual">action_group_name_changed( const QString&amp; )</slot>
+    <slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString&amp; )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index 4af53b2bf..d78c6b5f1 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -119,8 +119,8 @@
             <verstretch>0</verstretch>
         </sizepolicy>
         <pixmap>image0</pixmap>
-        <signal>currentChanged(QListViewItem*)</signal>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -149,17 +149,17 @@
     </connection>
     <connection>
         <sender>actions_listview</sender>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Action_list_widget_ui</receiver>
-        <slot>current_changed(QListViewItem*)</slot>
+        <slot>current_changed(TQListViewItem*)</slot>
     </connection>
 </connections>
 <forwards>
-    <forward>class QListViewItem;</forward>
+    <forward>class TQListViewItem;</forward>
 </forwards>
 <Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
-    <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
+    <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
 </Q_SLOTS>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index a9f8b9d25..9b3727ffd 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -119,7 +119,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
         <pixmap>image0</pixmap>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -148,17 +148,17 @@
     </connection>
     <connection>
         <sender>conditions_listview</sender>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Condition_list_widget_ui</receiver>
-        <slot>current_changed(QListViewItem*)</slot>
+        <slot>current_changed(TQListViewItem*)</slot>
     </connection>
 </connections>
 <forwards>
-    <forward>class QListViewItem;</forward>
+    <forward>class TQListViewItem;</forward>
 </forwards>
 <Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
-    <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
+    <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
 </Q_SLOTS>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index 164331529..24192fed3 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -134,7 +134,7 @@
     </vbox>
 </widget>
 <Q_SLOTS>
-    <slot access="protected" specifier="pure virtual">action_name_changed( const QString&amp; )</slot>
+    <slot access="protected" specifier="pure virtual">action_name_changed( const TQString&amp; )</slot>
     <slot access="protected" specifier="pure virtual">action_type_changed(int)</slot>
 </Q_SLOTS>
 <includes>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index f0b6c5691..557be7dd4 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -119,8 +119,8 @@
             <verstretch>0</verstretch>
         </sizepolicy>
         <pixmap>image0</pixmap>
-        <signal>currentChanged(QListViewItem*)</signal>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -149,17 +149,17 @@
     </connection>
     <connection>
         <sender>triggers_listview</sender>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Triggers_tab_ui</receiver>
-        <slot>current_changed(QListViewItem*)</slot>
+        <slot>current_changed(TQListViewItem*)</slot>
     </connection>
 </connections>
 <forwards>
-    <forward>class QListViewItem;</forward>
+    <forward>class TQListViewItem;</forward>
 </forwards>
 <Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
-    <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
+    <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
 </Q_SLOTS>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index 855b40e6a..2fe4e161d 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -119,7 +119,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
         <pixmap>image0</pixmap>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
     </customwidget>
 </customwidgets>
 <images>
@@ -148,9 +148,9 @@
     </connection>
     <connection>
         <sender>windows_listview</sender>
-        <signal>current_changed(QListViewItem*)</signal>
+        <signal>current_changed(TQListViewItem*)</signal>
         <receiver>Windowdef_list_widget_ui</receiver>
-        <slot>current_changed(QListViewItem*)</slot>
+        <slot>current_changed(TQListViewItem*)</slot>
     </connection>
 </connections>
 <forwards>
@@ -158,7 +158,7 @@
 </forwards>
 <Q_SLOTS>
     <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
-    <slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot>
+    <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
     <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
 </Q_SLOTS>
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc
index 3bd5e0a80..24ab027a8 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cc
@@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)
 
     TQPainter p(this);
 
-    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            tqcolorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp
index 2bce71229..95504bcf4 100644
--- a/kioslave/man/kio_man.cpp
+++ b/kioslave/man/kio_man.cpp
@@ -550,7 +550,7 @@ char *MANProtocol::readManPage(const char *_filename)
         const TQCString cstr=myStdStream.latin1();
         const int len = cstr.size()-1;
         buf = new char[len + 4];
-        qmemmove(buf + 1, cstr.data(), len);
+        tqmemmove(buf + 1, cstr.data(), len);
         buf[0]=buf[len]='\n'; // Start and end with a end of line
         buf[len+1]=buf[len+2]='\0'; // Two additional NUL characters at end
     }
@@ -582,7 +582,7 @@ char *MANProtocol::readManPage(const char *_filename)
         const TQCString cstr=myStdStream.utf8();
         const int len = cstr.size()-1;
         buf = new char[len + 4];
-        qmemmove(buf + 1, cstr.data(), len);
+        tqmemmove(buf + 1, cstr.data(), len);
         buf[0]=buf[len]='\n'; // Start and end with a end of line
         buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
     }
diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 172ab8520..7cffb906c 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
 
 void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
 {
-   if ((button & LeftButton) == 0) return;
+   if ((button & Qt::LeftButton) == 0) return;
    mOldPos = p;
    mDragFile = TQString::null;
    int cur = index(item);
@@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
 
 void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
 {
-   if (((e->state() & LeftButton) != 0) && !mDragFile.isEmpty())
+   if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
    {
       int delay = KGlobalSettings::dndEventDelay();
       TQPoint newPos = e->globalPos();
diff --git a/ksplashml/kcmksplash/installer.h b/ksplashml/kcmksplash/installer.h
index 22485d75c..ee3af491b 100644
--- a/ksplashml/kcmksplash/installer.h
+++ b/ksplashml/kcmksplash/installer.h
@@ -22,7 +22,7 @@ class TQTextEdit;
 class TQPushButton;
 class ThemeListBox;
 
-class SplashInstaller : public QWidget
+class SplashInstaller : public TQWidget
 {
   Q_OBJECT
 public:
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 091d70e9e..f382ba7a6 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -38,7 +38,7 @@
 // KSplash::KSplash(): This is a hidden object. Its sole purpose
 // is to manage the other objects, which are presented on the screen.
 KSplash::KSplash(const char *name)
-    : DCOPObject( name ),  TQWidget( 0, name, WStyle_Customize|WStyle_NoBorder|WX11BypassWM ),
+    : DCOPObject( name ),  TQWidget( 0, name, (WFlags)(WStyle_Customize|WStyle_NoBorder|WX11BypassWM) ),
       mState( 0 ), mMaxProgress( 0 ), mStep( 0 )
 {
   hide(); // We never show this object.
@@ -381,7 +381,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
   {
     TQStringList themeTitle;
     themeTitle << theme;
-    return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle));
+    return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
   }
   else
     return 0L;
@@ -416,7 +416,7 @@ TQPtrList<Action> KSplash::actionList()
 
 bool KSplash::eventFilter( TQObject *o, TQEvent *e )
 {
-  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
+  if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
   {
     TQTimer::singleShot( 0, this, TQT_SLOT(close()));
     return TRUE;
diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp
index 9d8ebddf5..fad480f7c 100644
--- a/kxkb/kxkbbindings.cpp
+++ b/kxkb/kxkbbindings.cpp
@@ -1,6 +1,6 @@
 #ifndef NOSLOTS
 # define DEF( name, key3, key4, fnSlot ) \
-   keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
+   keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
 #else
 # define DEF( name, key3, key4, fnSlot ) \
    keys->insert( name, i18n(name), TQString(), key3, key4 )