Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f96f74ffa7040e64ae3352e08c810c383c8a0ba2.

1 files changed, 13 insertions, 13 deletions

diff --git a/plugins/infowidget/chunkbar.cpp b/plugins/infowidget/chunkbar.cpp
index f8f421e..ad6dfd6 100644
--- a/plugins/infowidget/chunkbar.cpp
+++ b/plugins/infowidget/chunkbar.cpp
@@ -20,7 +20,7 @@
  ***************************************************************************/
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqvaluelist.h>
 #include <tqpixmap.h>
 #include <math.h>
@@ -71,15 +71,15 @@ namespace kt
 		TQMimeSourceFactory* factory = TQMimeSourceFactory::defaultFactory();
 		
 		TQImage excluded(16, 16, 32);
-		FillAndFrameBlack(&excluded, TQColor(bar->colorGroup().color(TQColorGroup::Mid)).pixel(), 16);
+		FillAndFrameBlack(&excluded, TQColor(bar->tqcolorGroup().color(TQColorGroup::Mid)).pixel(), 16);
 		factory->setImage("excluded_color", excluded);
 		
 		TQImage available(16, 16, 32);
-		FillAndFrameBlack(&available, bar->colorGroup().highlight().pixel(), 16);
+		FillAndFrameBlack(&available, bar->tqcolorGroup().highlight().pixel(), 16);
 		factory->setImage("available_color", available);
 		
 		TQImage unavailable(16, 16, 32);
-		FillAndFrameBlack(&unavailable, bar->colorGroup().base().pixel(), 16);
+		FillAndFrameBlack(&unavailable, bar->tqcolorGroup().base().pixel(), 16);
 		factory->setImage("unavailable_color", unavailable);
 	}
 	
@@ -121,7 +121,7 @@ namespace kt
 		//	PROFILE("ChunkBar::updateBar");
 		//	Out() << "Pixmap : " << s.width() << " " << s.height() << endl;
 			pixmap.resize(s);
-			pixmap.fill(colorGroup().color(TQColorGroup::Base));
+			pixmap.fill(tqcolorGroup().color(TQColorGroup::Base));
 			TQPainter painter(&pixmap);
 			drawBarContents(&painter);
 			update();
@@ -132,9 +132,9 @@ namespace kt
 	{
 		// first draw background
 		if (isEnabled())
-			p->setBrush(colorGroup().base());
+			p->setBrush(tqcolorGroup().base());
 		else
-			p->setBrush(colorGroup().background());
+			p->setBrush(tqcolorGroup().background());
 	
 		p->setPen(TQt::NoPen);
 		p->drawRect(contentsRect());
@@ -148,7 +148,7 @@ namespace kt
 		TQSize s = contentsRect().size();
 		//Out() << "Pixmap : " << s.width() << " " << s.height() << endl;
 		pixmap.resize(s);
-		pixmap.fill(colorGroup().color(TQColorGroup::Base));
+		pixmap.fill(tqcolorGroup().color(TQColorGroup::Base));
 		TQPainter painter(&pixmap);
 		drawBarContents(&painter);
 		update();
@@ -164,15 +164,15 @@ namespace kt
 			const BitSet & bs = getBitSet();
 			curr = bs;
 			if (bs.allOn())
-				drawAllOn(p,colorGroup().highlight());
+				drawAllOn(p,tqcolorGroup().highlight());
 			else if (s.total_chunks > w)
-				drawMoreChunksThenPixels(p,bs,colorGroup().highlight());
+				drawMoreChunksThenPixels(p,bs,tqcolorGroup().highlight());
 			else
-				drawEqual(p,bs,colorGroup().highlight());
+				drawEqual(p,bs,tqcolorGroup().highlight());
 	
 			if (show_excluded && s.num_chunks_excluded > 0)
 			{
-				TQColor c = colorGroup().color(TQColorGroup::Mid);
+				TQColor c = tqcolorGroup().color(TQColorGroup::Mid);
 				if (curr_ebs.allOn())
 					drawAllOn(p,c);
 				else if (s.total_chunks > w)
@@ -186,7 +186,7 @@ namespace kt
 	
 	void ChunkBar::drawEqual(TQPainter *p,const BitSet & bs,const TQColor & color)
 	{
-		//p->setPen(TQPen(colorGroup().highlight(),1,TQt::SolidLine));
+		//p->setPen(TQPen(tqcolorGroup().highlight(),1,TQt::SolidLine));
 		TQColor c = color;
 	
 		Uint32 w = contentsRect().width();