Allow kdebase to (mostly) function correctly with TQt for Qt4

Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)


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

4 files changed, 8 insertions, 8 deletions

diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index cf31fce0a..994a44c12 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -35,7 +35,7 @@ noinst_HEADERS = desktop.h bgmanager.h krootwm.h \
 
 kcheckrunning_SOURCES = kcheckrunning.cpp
 kcheckrunning_LDFLAGS = $(all_libraries)
-kcheckrunning_LDADD = $(LIB_X11)
+kcheckrunning_LDADD = $(LIB_X11) $(LIB_QT)
 
 kxdglauncher_SOURCES = kxdglauncher.cpp
 kxdglauncher_LDFLAGS = $(all_libraries)
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index de58e0d24..a3ddff56f 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -1179,7 +1179,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int
 
 void KDesktop::removeIcon(const TQString &_url)
 {
-	if (_url.at(0) != '/') {
+	if (_url.tqat(0) != '/') {
 		qDebug("removeIcon with relative path not supported for now");
 		return;
 	}
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 076831bba..23c89f8ce 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -159,7 +159,7 @@ KDIconView::KDIconView( TQWidget *parent, const char* name )
     // Initialize media handler
     mMediaListView = new TQListView();
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL(dataChanged()),
              this, TQT_SLOT(slotClipboardDataChanged()) );
 
     setURL( desktopURL() ); // sets m_url
@@ -441,8 +441,8 @@ void KDIconView::createActions()
         (void) new KAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, TQT_TQOBJECT(this), TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" );
         (void) new KAction( i18n( "&Properties" ), ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" );
         KAction* trash = new KAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" );
-        connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ),
-                 this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) );
+        connect( trash, TQT_SIGNAL( activated( KAction::ActivationReason, TQt::ButtonState ) ),
+                 this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, TQt::ButtonState ) ) );
 
         KConfig config("kdeglobals", true, false);
         config.setGroup( "KDE" );
@@ -1047,7 +1047,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
   bool firstRun = (count() == 0);  // no icons yet, this seems to be the initial loading
 
   // delay updates until all new items have been created
-  setUpdatesEnabled( false );
+  tqsetUpdatesEnabled( false );
   TQRect area = iconArea();
   setIconArea( TQRect(  0, 0, -1, -1 ) );
 
@@ -1150,7 +1150,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
   if ( m_autoAlign )
       lineupIcons();
 
-  setUpdatesEnabled( true );
+  tqsetUpdatesEnabled( true );
 }
 
 // -----------------------------------------------------------------------------
diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp
index e8493b92b..b90bf3b52 100644
--- a/kdesktop/kshadowengine.cpp
+++ b/kdesktop/kshadowengine.cpp
@@ -84,8 +84,8 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC
     result.create(w, h, 32);
   }
 
-  result.fill(0); // all black
   result.setAlphaBuffer(true);
+  result.fill(0); // all black
 
   for (int i = thick; i < w - thick; i++)
   {