From 395a904bff7b4d6ead445c342f7ac0c5fbf29121 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 18 Jun 2011 17:00:31 +0000
Subject: TQt4 port kdeaddons This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 noatun-plugins/oblique/view.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'noatun-plugins/oblique/view.cpp')

diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp
index 8c7f81d..91d07c9 100644
--- a/noatun-plugins/oblique/view.cpp
+++ b/noatun-plugins/oblique/view.cpp
@@ -20,8 +20,8 @@
 class TabWidget : public KTabWidget
 {
 public:
-	TabWidget(TQWidget *parent)
-		: KTabWidget(parent)
+	TabWidget(TQWidget *tqparent)
+		: KTabWidget(tqparent)
 	{
 	}
 public:
@@ -42,9 +42,9 @@ View::View(Oblique *oblique)
 	setCentralWidget(mTabs);
 
 	KAction *ac;
-	ac = new KAction(i18n("Add &Files..."), "queue", 0, this, TQT_SLOT(addFiles()), actionCollection(), "add_files");
+	ac = new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
 	ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection."));
-	ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, this, TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
+	ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
 	
 	
 //	ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload");
@@ -52,31 +52,31 @@ View::View(Oblique *oblique)
 
 	ac = new SliceListAction(
 			i18n("&Slices"), oblique,
-			this, TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
+			TQT_TQOBJECT(this), TQT_SLOT(use(Slice*)), TQValueList<File>(), actionCollection(), "slices"
 		);
 	ac->setWhatsThis(i18n("Select a sub-collection to display"));
 
 	mSchemaListAction = new SchemaListAction(
-			i18n("&Schemas"), this, TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
+			i18n("&Schemas"), TQT_TQOBJECT(this), TQT_SLOT(setSchema(const TQString&)), actionCollection(), "schemas"
 		);
 	mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree."));
 
 	ac = new KAction(
-			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT(addTab()),
+			i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()),
 			actionCollection(), "newtab"
 		);
 
 	mRemoveTabAction = new KAction(
-			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, this, TQT_SLOT(removeTab()),
+			i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()),
 			actionCollection(), "removecurrenttab"
 		);
 
 	{
 		TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget");
-		l->setBackgroundMode( Qt::PaletteButton );
-		l->setAlignment(
-				(TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
-					Qt::AlignVCenter | Qt::ShowPrefix
+		l->setBackgroundMode( TQt::PaletteButton );
+		l->tqsetAlignment(
+				(TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) |
+					TQt::AlignVCenter | TQt::ShowPrefix
 			);
 		l->adjustSize();
 		new KWidgetAction(l, i18n("&Jump:"), KShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label");
@@ -87,7 +87,7 @@ View::View(Oblique *oblique)
 		connect(jumpAction->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(jumpTextChanged(const TQString&)));
 	}
 
-	KStdAction::configureToolbars(this, TQT_SLOT(configureToolBars()), actionCollection());
+	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection());
 
 	applyMainWindowSettings(KGlobal::config(), "Oblique View");
 	createGUI("obliqueui.rc");
@@ -138,7 +138,7 @@ View::~View()
 		int slice = tree->slice()->id();
 		TQString query = tree->fileOfQuery();
 
-		TQString t = TQString("%1:%2").arg(slice).arg(query);
+		TQString t = TQString("%1:%2").tqarg(slice).tqarg(query);
 		tabids.append(t);
 	}
 	
@@ -241,8 +241,8 @@ void View::use(Slice *s)
 
 
 
-LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name)
-	: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name)
+LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *tqparent, const char *name)
+	: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, tqparent, name)
 {
 	setAutoSized(true);
 }
-- 
cgit v1.2.1