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/blurscope/Makefile.am        | 2 +-
 noatun-plugins/blurscope/scopedisplayer.cpp | 4 ++--
 noatun-plugins/blurscope/sdlscope.h         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'noatun-plugins/blurscope')

diff --git a/noatun-plugins/blurscope/Makefile.am b/noatun-plugins/blurscope/Makefile.am
index 6ac86b3..a09d5e7 100644
--- a/noatun-plugins/blurscope/Makefile.am
+++ b/noatun-plugins/blurscope/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= $(all_includes) $(SDL_CFLAGS)
+INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/kde
 
 kde_module_LTLIBRARIES = noatunblurscope.la
 noatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp
diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp
index 42b375a..6b10732 100644
--- a/noatun-plugins/blurscope/scopedisplayer.cpp
+++ b/noatun-plugins/blurscope/scopedisplayer.cpp
@@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false)
 			d++;
 			x++;
 		}
-		repaint();
+		tqrepaint();
 	}
 }
 
@@ -233,7 +233,7 @@ void SDLView::checkInput()
 
 #define output2 ((unsigned char*)outputBmp.data)
 
-void SDLView::repaint()
+void SDLView::tqrepaint()
 {
 	SDL_LockSurface(surface);
 	TEST();
diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h
index 45c734c..73e6d6d 100644
--- a/noatun-plugins/blurscope/sdlscope.h
+++ b/noatun-plugins/blurscope/sdlscope.h
@@ -94,7 +94,7 @@ protected:
 	void checkInput();
 	void setupPalette(double dummy=0.0);
 
-	void repaint();
+	void tqrepaint();
 
 private:
 	int mFd;
-- 
cgit v1.2.1