Fix kwin-style-crystal FTBFS

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kwin-style-crystal@1239186 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 16 insertions, 16 deletions

diff --git a/client/crystalclient.cc b/client/crystalclient.cc
index d81db20..e8780aa 100644
--- a/client/crystalclient.cc
+++ b/client/crystalclient.cc
@@ -87,7 +87,7 @@ CrystalFactory::CrystalFactory()
 	readConfig();
 	initialized_ = true;
 
-	if (transparency)image_holder=new TQImageHolder(active.userdefinedPicture,inactive.userdefinedPicture);
+	if (transparency)image_holder=new QImageHolder(active.userdefinedPicture,inactive.userdefinedPicture);
 		else image_holder=NULL;
 	CreateButtonImages();
 }
@@ -117,7 +117,7 @@ bool CrystalFactory::reset(unsigned long /*changed*/)
 
 	if (transparency)
 	{
-		if (!image_holder)image_holder=new TQImageHolder(active.userdefinedPicture,inactive.userdefinedPicture);
+		if (!image_holder)image_holder=new QImageHolder(active.userdefinedPicture,inactive.userdefinedPicture);
 		image_holder->setUserdefinedPictures(active.userdefinedPicture,inactive.userdefinedPicture);
 		image_holder->tqrepaint(true);
 	}else{
diff --git a/client/crystalclient.h b/client/crystalclient.h
index 403a22f..0385c2d 100644
--- a/client/crystalclient.h
+++ b/client/crystalclient.h
@@ -42,7 +42,7 @@ class CrystalClient;
 class CrystalFactory;
 class CrystalButton;
 class CrystalTray;
-class TQImageHolder;
+class QImageHolder;
 class ButtonImage;
 
 extern CrystalFactory *factory;
@@ -110,7 +110,7 @@ public:
 	static bool initialized() { return initialized_; }
 	static TQt::AlignmentFlags titleAlign() { return titlealign_; }
 public:
-	TQImageHolder *image_holder;
+	QImageHolder *image_holder;
 
 	TQPixmap logo;
 	int logoEnabled,logoStretch,logoActive,logoDistance;
diff --git a/client/imageholder.cpp b/client/imageholder.cpp
index 5b1007a..8897646 100644
--- a/client/imageholder.cpp
+++ b/client/imageholder.cpp
@@ -28,7 +28,7 @@
 #include "crystalclient.h"
 
 
-TQImageHolder::TQImageHolder(TQImage act,TQImage inact)
+QImageHolder::QImageHolder(TQImage act,TQImage inact)
 :img_active(NULL),img_inactive(NULL)
 {
 	rootpixmap=NULL;
@@ -38,14 +38,14 @@ TQImageHolder::TQImageHolder(TQImage act,TQImage inact)
 	emit tqrepaintNeeded();
 }
 
-TQImageHolder::~TQImageHolder()
+QImageHolder::~QImageHolder()
 {
 	if (rootpixmap)delete rootpixmap;
 	if (img_active && !userdefinedActive)delete img_active;
 	if (img_inactive && !userdefinedInactive)delete img_inactive;
 }
 
-void TQImageHolder::setUserdefinedPictures( TQImage act,TQImage inact)
+void QImageHolder::setUserdefinedPictures( TQImage act,TQImage inact)
 {
 	int w=TQApplication::desktop()->width();
 	int h=TQApplication::desktop()->height();
@@ -77,7 +77,7 @@ void TQImageHolder::setUserdefinedPictures( TQImage act,TQImage inact)
 	CheckSanity();
 }
 
-void TQImageHolder::Init()
+void QImageHolder::Init()
 {
 	if (initialized)return;
 	
@@ -90,18 +90,18 @@ void TQImageHolder::Init()
 	initialized=true;
 }
 
-void TQImageHolder::tqrepaint(bool force)
+void QImageHolder::tqrepaint(bool force)
 {
 	Init(); 
 	if (rootpixmap)rootpixmap->tqrepaint(force);
 }
 
-void TQImageHolder::handleDesktopChanged(int)
+void QImageHolder::handleDesktopChanged(int)
 {
 	tqrepaint(true);
 }
 
-void TQImageHolder::CheckSanity()
+void QImageHolder::CheckSanity()
 {
 	if (!initialized)return;
 	if (userdefinedActive && userdefinedInactive)return;
@@ -114,7 +114,7 @@ void TQImageHolder::CheckSanity()
 	initialized=false;
 }
 
-TQPixmap* TQImageHolder::ApplyEffect(TQImage &src,WND_CONFIG* cfg,TQColorGroup colorgroup)
+TQPixmap* QImageHolder::ApplyEffect(TQImage &src,WND_CONFIG* cfg,TQColorGroup colorgroup)
 {
 	TQImage dst;
 	
@@ -142,7 +142,7 @@ TQPixmap* TQImageHolder::ApplyEffect(TQImage &src,WND_CONFIG* cfg,TQColorGroup c
 	return new TQPixmap(dst);
 }
 
-void TQImageHolder::BackgroundUpdated(const TQImage *src)
+void QImageHolder::BackgroundUpdated(const TQImage *src)
 {
 	if (img_active && !userdefinedActive)
 	{
diff --git a/client/imageholder.h b/client/imageholder.h
index e41e000..790b20d 100644
--- a/client/imageholder.h
+++ b/client/imageholder.h
@@ -28,13 +28,13 @@
 
 struct WND_CONFIG;
 
-class TQImageHolder:public TQObject
+class QImageHolder:public TQObject
 {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	TQImageHolder(TQImage act,TQImage inact);
-	virtual ~TQImageHolder();
+	QImageHolder(TQImage act,TQImage inact);
+	virtual ~QImageHolder();
 	
 	void Init();
 	TQPixmap *image(bool active) { Init(); return active?img_active:img_inactive; }