From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 19 Jan 2011 01:42:14 +0000
Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break
 compatibility with TQt for Qt3; if it does please fix it ASAP!

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kicker/applets/media/mediaapplet.cpp       | 14 +++++++-------
 kicker/applets/media/mediumbutton.cpp      |  8 ++++----
 kicker/applets/media/preferencesdialog.cpp |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'kicker/applets/media')

diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index b137b5d5c..25b5869ff 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons()
         MediumButton *button = *it;
         
         button_size = std::max(button_size,
-                            orientation() == Vertical ?
+                            orientation() == Qt::Vertical ?
                     button->heightForWidth(width()) :
                 button->widthForHeight(height()) );
     //		                           button->widthForHeight(height()) :
@@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons()
     }
     
     int kicker_size;
-    if (orientation() == Vertical)
+    if (orientation() == Qt::Vertical)
     {
         kicker_size = width();
     }
@@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons()
         
         ++pack_count;
     
-        if(orientation() == Vertical)
+        if(orientation() == Qt::Vertical)
                     {
         if (pack_count < max_packed_buttons)
         {
@@ -285,7 +285,7 @@ void MediaApplet::slotNewItems(const KFileItemList &entries)
         }
         }
         
-        if(!found && !mExcludedList.contains(it.current()->url().url()) )
+        if(!found && !mExcludedList.tqcontains(it.current()->url().url()) )
         {
         MediumButton *button = new MediumButton(this, *it.current());
         button->show();
@@ -336,7 +336,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
         
         if(button->fileItem().url()==(*it.current()).url())
         {
-            if(mExcludedTypesList.contains(mimetype))
+            if(mExcludedTypesList.tqcontains(mimetype))
             {
             mButtonList.remove(button);
             delete button;
@@ -350,7 +350,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries)
         }
         }
     
-        if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) )
+        if(!found && !mExcludedTypesList.tqcontains(mimetype) && !mExcludedList.tqcontains(it.current()->url().url()) )
         {
         MediumButton *button = new MediumButton(this, *it.current());
         button->show();
@@ -425,7 +425,7 @@ void MediaApplet::reloadList()
 
 void MediaApplet::mousePressEvent(TQMouseEvent *e)
 {
-    if(e->button()==RightButton)
+    if(e->button()==Qt::RightButton)
     {
         KPopupMenu menu(this);
     
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index 0fae43441..1e71fbd6f 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -45,13 +45,13 @@
 #include <konq_drag.h>
 
 MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem)
-	: PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0,
+	: PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0,
                 "MediumButton::mOpenTimer")
 {
-    KAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()),
+    KAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()),
                                     &mActions, "pasteto");
     a->setShortcut(0);
-    a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy");
+    a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy");
     a->setShortcut(0);
     
     setBackgroundOrigin(AncestorOrigin);
@@ -145,7 +145,7 @@ void MediumButton::slotCopy()
 {
     KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false);
     
-    TQApplication::clipboard()->setData( obj );
+    TQApplication::tqclipboard()->setData( obj );
 }
 
 void MediumButton::dragEnterEvent(TQDragEnterEvent* e)
diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp
index 8d9cdcc94..3833f5062 100644
--- a/kicker/applets/media/preferencesdialog.cpp
+++ b/kicker/applets/media/preferencesdialog.cpp
@@ -26,7 +26,7 @@
 #include <klistview.h>
 #include <kfiledetailview.h>
 
-class MediumTypeItem : public QCheckListItem
+class MediumTypeItem : public TQCheckListItem
 {
 public:
 	MediumTypeItem(TQListView *parent, const TQString name,
@@ -40,7 +40,7 @@ private:
 	TQString mMimeType;
 };
 
-class MediumItem : public QCheckListItem
+class MediumItem : public TQCheckListItem
 {
 public:
 	MediumItem(TQListView *parent, const TQString name,
@@ -125,7 +125,7 @@ void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList)
 	{
 		if ((*it)->name().startsWith("media/"))
 		{
-			bool ok=excludedTypesList.contains((*it)->name())==0;
+			bool ok=excludedTypesList.tqcontains((*it)->name())==0;
 			MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name());
 			item->setOn(ok);
 		}
@@ -156,7 +156,7 @@ void PreferencesDialog::setExcludedMedia(TQStringList excludedList)
 	{
 		++it;
 
-		bool ok = excludedList.contains(file->url().url())==0;
+		bool ok = excludedList.tqcontains(file->url().url())==0;
 		MediumItem *item = new MediumItem(mpMediaListView,
 		                                  file->text(), *file);
 		item->setOn(ok);
-- 
cgit v1.2.1