Drop USE_TQT4 code

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 014f6d2586905e03681aa6fb9a85c2c8190e53f4)

18 files changed, 6 insertions, 106 deletions

diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index d6d8f6d11..7db5fbf91 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -85,7 +85,6 @@ public:
  bool reverseScrollPolarity;
 
  #ifdef HAVE_LIBUSB
- // TODO: In Qt4, replace with a better container.
  TQPtrList <LogitechMouse> logitechMouseList;
  #endif
 };
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index 893c75d7a..da8d0173d 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -256,12 +256,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name,
 
 ProxyWidget::~ProxyWidget()
 {
-#ifdef USE_QT4
-  #warning Possible memory leak in ProxyWidget::~ProxyWidget()
-#else // USE_QT4
   if (_client) delete _client;
   _client = 0;
-#endif // USE_QT4
 }
 
 TQString ProxyWidget::quickHelp() const
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index c12778fbb..11d834630 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -211,38 +211,6 @@ ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
 {
 }
 
-#ifdef USE_QT4
-/*!
-    \reimp
-*/
-int ContainerAreaLayout::count() const {
-	return m_items.count();
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* ContainerAreaLayout::itemAt(int index) const {
-	return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0;
-}
-
-/*!
-    \reimp
-*/
-TQLayoutItem* ContainerAreaLayout::takeAt(int index) {
-	if (index < 0 || index >= m_items.count())
-		return 0;
-	ContainerAreaLayoutItem *b = *m_items.at(index);
-	m_items.remove(m_items.at(index));
-	TQLayoutItem *item = b->item;
-	b->item = 0;
-	delete b;
-
-	invalidate();
-	return item;
-}
-#endif // USE_QT4
-
 void ContainerAreaLayout::addItem(TQLayoutItem* item)
 {
     m_items.append(new ContainerAreaLayoutItem(static_cast<TQLayoutItem*>(item), this));
@@ -445,13 +413,7 @@ TQSize ContainerAreaLayout::minimumSize() const
 
 TQLayoutIterator ContainerAreaLayout::iterator()
 {
-    // [FIXME]
-#ifdef USE_QT4
-    #warning [FIXME] ContainerAreaLayout iterators may not function correctly under Qt4
-    return TQLayoutIterator(this);	    	// [FIXME]
-#else // USE_QT4
     return TQLayoutIterator(new ContainerAreaLayoutIterator(&m_items));
-#endif // USE_QT4
 }
 
 void ContainerAreaLayout::setGeometry(const TQRect& rect)
diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h
index 4edeb8be2..abb28c6f0 100644
--- a/kicker/kicker/core/containerarealayout.h
+++ b/kicker/kicker/core/containerarealayout.h
@@ -108,12 +108,6 @@ class ContainerAreaLayout : public TQLayout
         int leftR() const;
         int rightR() const;
 
-#ifdef USE_QT4
-
-        QLAYOUT_REQUIRED_METHOD_DECLARATIONS
-
-#endif // USE_QT4
-
     private:
         int moveContainerPushRecursive(ItemList::const_iterator it, int distance);
         int distanceToPreviousItem(ItemList::const_iterator it) const;
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index b99d6e3ba..e9329e225 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -122,9 +122,6 @@ void PanelKMenu::hideMenu()
 {
     hide();
 
-#ifdef USE_QT4
-    // The hacks below aren't needed any more because Qt4 supports true transparency for the fading logout screen
-#else // USE_QT4
     // Try to redraw the area under the menu
     // Qt makes this surprisingly difficult to do in a timely fashion!
     while (isShown() == true)
@@ -148,7 +145,6 @@ void PanelKMenu::hideMenu()
     delaytimer->start( 100, TRUE );	// Wait for 100 milliseconds
     while (windowTimerTimedOut == false)
         kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 1000);
-#endif // USE_QT4
 }
 
 void PanelKMenu::windowClearTimeout()
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 62f7f055a..8c45d519d 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -470,14 +470,9 @@ void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int al
     if (pix.isNull() || last_color != color || last_alpha != alpha)
     {
         TQImage img(16, 16, 32);
-#ifdef USE_QT4
+        img.setAlphaBuffer(false);
+        img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
         img.setAlphaBuffer(true);
-	img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-#else // USE_QT4
-	img.setAlphaBuffer(false);
-	img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
-	img.setAlphaBuffer(true);
-#endif // USE_QT4
         pix.convertFromImage(img);
         last_color = color;
         last_alpha = alpha;
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 252cf4ac2..1a713fe25 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -118,9 +118,6 @@ private:
 };
 
 extern bool tqt_qclipboard_bailout_hack;
-#if KDE_IS_VERSION( 15, 0, 0 )
-#error Check status of #80072 with Qt4.
-#endif
 
 static void ensureGlobalSyncOff(TDEConfig* config);
 
diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp
index 7a620f0fd..d5e5d0ef5 100644
--- a/konqueror/konq_frame.cpp
+++ b/konqueror/konq_frame.cpp
@@ -460,11 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode )
 void
 KonqFrame::paintEvent( TQPaintEvent* )
 {
-#ifdef USE_QT4
-   #warning [INFO] Repaint call disabled in Qt4 to prevent recursive repaint (which otherwise occurs for unknown reasons)
-#else // USE_QT4
    m_pStatusBar->repaint();
-#endif // USE_QT4
 }
 
 void KonqFrame::slotRemoveView()
diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp
index 88b5c8dce..0d0b11994 100644
--- a/konsole/konsole/TEWidget.cpp
+++ b/konsole/konsole/TEWidget.cpp
@@ -636,11 +636,7 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect,
       if (pm)
         paint.setBackgroundMode( Qt::TransparentMode );
       if (clear || (blinking && (attr->r & RE_BLINK))) {
-#ifdef USE_QT4
-        paint.eraseRect(rect);
-#else // USE_QT4
         erase(rect);
-#endif // USE_QT4
       }
     }
     else
diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h
index 43ef2203e..95e99cdcd 100644
--- a/konsole/konsole/konsole.h
+++ b/konsole/konsole/konsole.h
@@ -297,7 +297,7 @@ private:
   TQPtrDict<TDERadioAction> session2action;
   TQPtrList<TESession> sessions;
 
-  TQIntDict<KSimpleConfig> no2command;     //QT4 - convert to QList
+  TQIntDict<KSimpleConfig> no2command;
 
   KSimpleConfig* m_defaultSession;
   TQString m_defaultSessionFilename;
diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h
index 618683c17..c32f26221 100644
--- a/konsole/konsole/schema.h
+++ b/konsole/konsole/schema.h
@@ -187,10 +187,6 @@ public:
 	uint count() const { return TQPtrList<ColorSchema>::count(); } ;
 	const ColorSchema *at(unsigned int i)
 		{ return TQPtrList<ColorSchema>::at(i); } ;
-#ifdef USE_QT4
-	const ColorSchema *at(unsigned int i)
-		{ return at(i); } ;
-#endif // USE_QT4
 
    void sort() {TQPtrList<ColorSchema>::sort();};
 
diff --git a/ksmserver/global.h b/ksmserver/global.h
index b76a8b363..326587ac6 100644
--- a/ksmserver/global.h
+++ b/ksmserver/global.h
@@ -10,8 +10,4 @@ Copyright (C) 2000 Matthias Ettrich <[email protected]>
 #define KSMVendorString "KDE"
 #define KSMReleaseString "1.0"
 
-#ifdef USE_QT4
-#define NO_QT3_DBUS_SUPPORT
-#endif
-
 #endif
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 81d765a99..3fd1d786d 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -313,9 +313,6 @@ void KSplash::startupComplete()
 void KSplash::close()
 {
   TQWidget::close();
-#ifdef USE_QT4
-  exit(0);
-#endif // USE_QT4
 }
 
 void KSplash::hide()
diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h
index 23f89b76d..a5ad616b2 100644
--- a/ksplashml/wndmain.h
+++ b/ksplashml/wndmain.h
@@ -56,17 +56,7 @@ public:
   ASYNC startupComplete();
   ASYNC show();
   ASYNC hide();
-
-  // [FIXME] How can I more easily let Qt know about these slots?  moc-tqt perhaps?
-  // More importantly, how was this code even running under Qt3?
-  // Was it somehow running the TQWidget::close() slot instead of the KSplash::close() non-slot method?
-  // Either way it looks like accidental/undefined behaviour to me...
-#ifndef Q_MOC_RUN
   ASYNC close();
-#else // Q_MOC_RUN
-public slots:
-  void close();
-#endif // Q_MOC_RUN
 
 signals:
   void stepsChanged(int);
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index a8c5751c0..0b5f433e6 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -4190,13 +4190,13 @@ static char *scan_request(char *c)
                         if (mode)
                         {
                             // .rm ReMove
-                            s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+                            s_stringDefinitionMap.remove(name);
                         }
                         else
                         {
                             // .rn ReName
                             StringDefinition def=(*it);
-                            s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+                            s_stringDefinitionMap.remove(name);
                             s_stringDefinitionMap.insert(name2,def);
                         }
                     }
@@ -5152,7 +5152,7 @@ static char *scan_request(char *c)
                     else
                     {
                         NumberDefinition def=(*it);
-                        s_numberDefinitionMap.remove(name); // ### QT4: removeAll
+                        s_numberDefinitionMap.remove(name);
                         s_numberDefinitionMap.insert(name2,def);
                     }
                     kdDebug(7107) << "end .rnn" << endl;
diff --git a/tdeioslave/smtp/smtp.h b/tdeioslave/smtp/smtp.h
index 853ff3ec6..9d324fe0c 100644
--- a/tdeioslave/smtp/smtp.h
+++ b/tdeioslave/smtp/smtp.h
@@ -39,9 +39,7 @@
 class KURL;
 class TQCString;
 template <typename T> class TQMemArray;
-#ifdef USE_QT3
 typedef TQMemArray<char> TQByteArray;
-#endif // USE_QT3
 
 namespace KioSMTP {
   class Response;
diff --git a/twin/main.cpp b/twin/main.cpp
index 4fd81d245..e3e3c6ea3 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -84,10 +84,6 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
 Application::Application( )
 : TDEApplication( ), owner( screen_number )
     {
-#ifdef USE_QT4
-    // I'm special...
-    setQuitOnLastWindowClosed(false);
-#endif // USE_QT4
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     if (!config()->isImmutable() && args->isSet("lock"))
         {
diff --git a/twin/utils.cpp b/twin/utils.cpp
index e7e5c7d32..949893a74 100644
--- a/twin/utils.cpp
+++ b/twin/utils.cpp
@@ -37,10 +37,6 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "atoms.h"
 #include "notifications.h"
 
-#ifdef USE_QT4
-#include <Qt/qx11info_x11.h>
-#endif // USE_QT4
-
 #endif
 
 namespace KWinInternal