diff --git a/src/common/gui/container.h b/src/common/gui/container.h
index cf3f351..880fd28 100644
--- a/src/common/gui/container.h
+++ b/src/common/gui/container.h
@@ -27,7 +27,7 @@ public:
   Container(TQWidgetStack *stack, uint index, Type type = Flat);
   Container(TQTabWidget *tabw, const TQString &title, Type type = Flat);
   void addWidget(TQWidget *widget, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0);
-  void addLayout(TQLayout *tqlayout, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0);
+  void addLayout(TQLayout *layout, uint startRow, uint endRow, uint startCol, uint endCol, int alignment = 0);
   uint numRows() const { return _gridLayout->numRows(); }
   uint numCols() const { return _gridLayout->numCols(); }
   void setFrame(Type type);
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index df9ad0e..c76ac0a 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -55,7 +55,7 @@ LikeBack::LikeBack(Button buttons)
  : TQWidget( 0, "LikeBack", TQt::WX11BypassWM | TQt::WStyle_NoBorder | TQt::WNoAutoErase | TQt::WStyle_StaysOnTop | TQt::WStyle_NoBorder | TQt::TQt::WGroupLeader)
  , m_buttons(buttons)
 {
-        TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+        TQHBoxLayout *layout = new TQHBoxLayout(this);
 
         TQIconSet likeIconSet      = kapp->iconLoader()->loadIconSet("likeback_like",      KIcon::Small);
         TQIconSet dislikeIconSet   = kapp->iconLoader()->loadIconSet("likeback_dislike",   KIcon::Small);
@@ -67,21 +67,21 @@ LikeBack::LikeBack(Button buttons)
         m_likeButton->setTextLabel(i18n("I Like..."));
         m_likeButton->setAutoRaise(true);
         connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iLike()) );
-        tqlayout->add(m_likeButton);
+        layout->add(m_likeButton);
 
         TQToolButton *m_dislikeButton = new TQToolButton(this, "idonotlike");
         m_dislikeButton->setIconSet(dislikeIconSet);
         m_dislikeButton->setTextLabel(i18n("I Do not Like..."));
         m_dislikeButton->setAutoRaise(true);
         connect( m_dislikeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iDoNotLike()) );
-        tqlayout->add(m_dislikeButton);
+        layout->add(m_dislikeButton);
 
         TQToolButton *m_bugButton = new TQToolButton(this, "ifoundabug");
         m_bugButton->setIconSet(bugIconSet);
         m_bugButton->setTextLabel(i18n("I Found a Bug..."));
         m_bugButton->setAutoRaise(true);
         connect( m_bugButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(iFoundABug()) );
-        tqlayout->add(m_bugButton);
+        layout->add(m_bugButton);
 
         m_configureButton = new TQToolButton(this, "configure");
         TQIconSet helpIconSet = kapp->iconLoader()->loadIconSet("help", KIcon::Small);
@@ -89,7 +89,7 @@ LikeBack::LikeBack(Button buttons)
         m_configureButton->setTextLabel(i18n("Configure..."));
         m_configureButton->setAutoRaise(true);
         connect( m_likeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()) );
-        tqlayout->add(m_configureButton);
+        layout->add(m_configureButton);
 
         TQPopupMenu *configureMenu = new TQPopupMenu(this);
         configureMenu->insertItem(helpIconSet, i18n("What's &This?"), this , TQT_SLOT(showWhatsThisMessage()) );
diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp
index 15fe174..ac622fe 100644
--- a/src/libgui/project_wizard.cpp
+++ b/src/libgui/project_wizard.cpp
@@ -76,7 +76,7 @@ FileListBox::FileListBox(TQWidget *parent)
   _listView->header()->setResizeEnabled(false);
   _listView->header()->setMovingEnabled(false);
   _listView->setColumnText(0, i18n("Copy"));
-  int spacing = tqstyle().pixelMetric(TQStyle::PM_HeaderMargin);
+  int spacing = style().pixelMetric(TQStyle::PM_HeaderMargin);
   TQFontMetrics fm(font());
   _listView->header()->resizeSection(0, fm.width(i18n("Copy")) + 2*spacing); // hack
   _listView->setColumnText(1, i18n("Filename"));