Fix icon activation glich under Qt4

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

3 files changed, 17 insertions, 7 deletions

diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 40d85d460..7195f9271 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -785,7 +785,7 @@ void KNotify::restartedArtsd()
 #ifndef WITHOUT_ARTS
     delete d->audioManager;
     d->audioManager = new KAudioManagerPlay( soundServer );
-    d->audioManager->setTitle( i18n( "KDE System Notifications" ) );
+    d->audioManager->setTitle( i18n( "Trinity System Notifications" ) );
     d->audioManager->setAutoRestoreID( "KNotify Aman Play" );
 #endif
 }
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index ddbfd4a05..de3a7028d 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -20,9 +20,20 @@
 
 #include "config.h"
 
+// #ifdef QTRANSLATOR_H
+// #error qtranslator.h was already included
+// #endif // QTRANSLATOR_H
+// 
+// #ifdef TQTRANSLATOR_H
+// #error tqtranslator.h was already included
+// #endif // TQTRANSLATOR_H
+
 #undef QT_NO_TRANSLATION
+#undef TQT_NO_TRANSLATION
 #include <tqtranslator.h>
+#include "kapplication.h"
 #define QT_NO_TRANSLATION
+#define TQT_NO_TRANSLATION
 #include <tqdir.h>
 #include <tqptrcollection.h>
 #include <tqwidgetlist.h>
@@ -46,9 +57,6 @@
 #include <tqsqlpropertymap.h>
 #endif
 
-#undef QT_NO_TRANSLATION
-#include "kapplication.h"
-#define QT_NO_TRANSLATION
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kdecore/kiconeffect.cpp b/kdecore/kiconeffect.cpp
index 3d5833578..b34ca1e97 100644
--- a/kdecore/kiconeffect.cpp
+++ b/kdecore/kiconeffect.cpp
@@ -784,7 +784,7 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap)
     }
 
     uint actSpeed = KGlobalSettings::visualActivateSpeed();
-    uint actCount = QMIN(rect.width(), rect.height()) / 4;
+    uint actCount = TQMIN(rect.width(), rect.height()) / 4;
 
 
     // Clip actCount to range 1..10.
@@ -846,21 +846,23 @@ KIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap)
     if ((widget->rect().width() <= maxRect.width())
        || (widget->rect().height() <= maxRect.height()))
     {
-        p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE);
+//	p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE);	// WARNING: This was done in Qt3.  It only worked in this placement due to a glitch in Qt3; it has therefore been moved below grabWidget, where it should have been in the first place.
 	pix = TQPixmap::grabWindow((TQApplication::desktop()->screen( -1 ))->winId(),
 		    		      maxRect.x(),
 				      maxRect.y(),
 				      maxRect.width(),
 				      maxRect.height());
+        p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE);
     } else
     {
 	// not as ugly as drawing directly to the screen
-	p = new TQPainter(widget);
+//	p = new TQPainter(widget);	// WARNING: This was done in Qt3.  See above.
 	pix = TQPixmap::grabWidget(widget,
 			              maxRect.x(),
 				      maxRect.y(),
 				      maxRect.width(),
 				      maxRect.height());
+	p = new TQPainter(widget);
     }
     uchar deltaAlpha = 255 / (actCount * 1.2);