2 files changed, 15 insertions, 15 deletions

diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index 4afc15d..0966f58 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -179,7 +179,7 @@ void KbStateApplet::updateMenu()
 
 void calculateSizes (int space, int modifiers, int lockkeys, int accessx,
 							bool showMouse, int &lines, int &length, int &size)
-// Calculates the layout based on a given number of modifiers, lockkeys and
+// Calculates the tqlayout based on a given number of modifiers, lockkeys and
 // accessx features.
 // Output:
 // lines:  number of lines
@@ -281,17 +281,17 @@ void KbStateApplet::toggleFillSpace() {
 	fillSpace = !fillSpace;
 	saveConfig();
 	updateMenu();
-	layout();
+	tqlayout();
 	updateGeometry();
 	emit updateLayout();
 }
 
 void KbStateApplet::resizeEvent( TQResizeEvent*e ) {
    TQWidget::resizeEvent(e);
-   layout();
+   tqlayout();
 }
 
-void KbStateApplet::layout() {
+void KbStateApplet::tqlayout() {
 	int size = this->size;
 
    int lines, length, x,y,dx,dy, ldx,ldy;
@@ -608,7 +608,7 @@ bool KbStateApplet::x11Event (XEvent *evt) {
 				else
 					mouse->setActiveKey (0);
 
-				layout();
+				tqlayout();
 				updateGeometry();
 				emit updateLayout();
 				break;
@@ -660,7 +660,7 @@ void KbStateApplet::stateChangeRequest (KeyIcon *source, bool latched, bool lock
 void KbStateApplet::toggleModifier() {
    showModifiers = !showModifiers;
    updateMenu();
-   layout();
+   tqlayout();
    updateGeometry();
    saveConfig();
    emit updateLayout();
@@ -669,7 +669,7 @@ void KbStateApplet::toggleModifier() {
 void KbStateApplet::toggleLockkeys() {
    showLockkeys = !showLockkeys;
    updateMenu();
-   layout();
+   tqlayout();
    updateGeometry();
    saveConfig();
    emit updateLayout();
@@ -678,7 +678,7 @@ void KbStateApplet::toggleLockkeys() {
 void KbStateApplet::toggleMouse() {
    showMouse = !showMouse;
    updateMenu();
-   layout();
+   tqlayout();
    updateGeometry();
    saveConfig();
    emit updateLayout();
@@ -687,7 +687,7 @@ void KbStateApplet::toggleMouse() {
 void KbStateApplet::toggleAccessX() {
 	showAccessX = !showAccessX;
 	updateMenu();
-	layout();
+	tqlayout();
 	updateGeometry();
 	saveConfig();
 	emit updateLayout();
@@ -810,7 +810,7 @@ void KeyIcon::drawButton (TQPainter *p) {
    int y = (height()-locked.height())/2;
    int o = 0;
    if (isLocked || isLatched) {
-      qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), true, 1, NULL);
+      qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), true, 1, NULL);
       p->fillRect (1,1,width()-2,height()-2, KGlobalSettings::highlightColor());
 		if (strcmp(modifierKeys[keyId].icon, ""))
 			p->drawPixmap (x+1,y+1, latched);
@@ -818,7 +818,7 @@ void KeyIcon::drawButton (TQPainter *p) {
       o = 1;
    }
    else {
-      qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), false, 1, NULL);
+      qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), false, 1, NULL);
 		if (strcmp(modifierKeys[keyId].icon, ""))
 			p->drawPixmap (x,y, unlatched);
       black = KGlobalSettings::textColor();
@@ -1068,12 +1068,12 @@ void TimeoutIcon::drawButton (TQPainter *p) {
 
 StatusIcon::StatusIcon (const TQString &text, TQWidget *parent, const char *name)
  : TQPushButton (text, parent, name) {
-   setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
+   tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored));
 }
 
 StatusIcon::~StatusIcon () {
 }
 
-TQSize StatusIcon::minimumSizeHint () const {
+TQSize StatusIcon::tqminimumSizeHint () const {
    return TQSize (0,0);
 }
diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h
index 65cf63f..fc6987f 100644
--- a/kbstateapplet/kbstate.h
+++ b/kbstateapplet/kbstate.h
@@ -40,7 +40,7 @@ public:
    StatusIcon (const TQString &text, TQWidget *parent, const char *name=0);
    ~StatusIcon ();
 
-   TQSize minimumSizeHint () const;
+   TQSize tqminimumSizeHint () const;
 };
 typedef TQPtrList<StatusIcon> IconList;
 
@@ -170,7 +170,7 @@ private slots:
 private:
    void loadConfig();
    void saveConfig();
-   void layout();
+   void tqlayout();
    
    int xkb_base_event_type;