1 files changed, 15 insertions, 15 deletions

diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp
index 06727a5..d7d3ecc 100644
--- a/src/svnfrontend/blamedisplay_impl.cpp
+++ b/src/svnfrontend/blamedisplay_impl.cpp
@@ -45,8 +45,8 @@
 #include <tqvbox.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textcodec.h>
 
 #define COL_LINENR 0
 #define COL_REV 1
@@ -100,7 +100,7 @@ public:
     BlameDisplayItem(KListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*);
     virtual ~BlameDisplayItem(){}
     virtual int compare(TQListViewItem *i, int col, bool ascending)const;
-    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+    virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
     virtual int rtti()const{return 1000;}
 
     virtual int width( const TQFontMetrics & fm, const TQListView * lv, int c ) const;
@@ -116,7 +116,7 @@ public:
         }
         TQString _line = m_Content.tLine();
         _line.replace("\t","    ");
-        setText(COL_LINE,TQString("%1").tqarg(_line));
+        setText(COL_LINE,TQString("%1").arg(_line));
     }
 
 protected:
@@ -153,17 +153,17 @@ int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, in
 void BlameDisplayItem::display()
 {
     if (m_disp){
-        setText(COL_REV,TQString("%1").tqarg(m_Content.revision()));
+        setText(COL_REV,TQString("%1").arg(m_Content.revision()));
         setText(COL_AUT,m_Content.tAuthor());
         if (m_Content.date().isValid()) {
             setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date()));
         }
     }
 
-    setText(COL_LINENR,TQString("%1").tqarg(m_Content.lineNumber()+1));
+    setText(COL_LINENR,TQString("%1").arg(m_Content.lineNumber()+1));
     TQString _line = m_Content.tLine();
     _line.replace("\t","    ");
-    setText(COL_LINE,TQString("%1").tqarg(_line));
+    setText(COL_LINE,TQString("%1").arg(_line));
 }
 
 int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)const
@@ -182,10 +182,10 @@ int BlameDisplayItem::compare(TQListViewItem *item, int col, bool ascending)cons
     return k->m_Content.lineNumber()-m_Content.lineNumber();
 }
 
-void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
 {
-    if (tqalignment & (AlignTop || AlignBottom) == 0)
-        tqalignment |= AlignVCenter;
+    if (alignment & (AlignTop || AlignBottom) == 0)
+        alignment |= AlignVCenter;
 
     /* don't copy string */
     const TQString & str = text(column);;
@@ -202,7 +202,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
         if (Kdesvnsettings::self()->colored_blame()) {
             _bgColor = cb->rev2color(m_Content.revision());
         } else {
-            _bgColor = listView()->viewport()->tqcolorGroup().base();
+            _bgColor = listView()->viewport()->colorGroup().base();
         }
     }
 
@@ -213,7 +213,7 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum
 
     if (str.isEmpty())
         return;
-    p->drawText(BORDER, 0, width - 2*BORDER, height(), tqalignment, str);
+    p->drawText(BORDER, 0, width - 2*BORDER, height(), alignment, str);
 }
 
 class BlameDisplayData
@@ -344,7 +344,7 @@ const TQColor BlameDisplay_impl::rev2color(svn_revnum_t r )const
     {
         return m_Data->m_shadingMap[r];
     } else {
-        return m_BlameList->viewport()->tqcolorGroup().base();
+        return m_BlameList->viewport()->colorGroup().base();
     }
 }
 
@@ -411,7 +411,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
     }
     KDialogBase* dlg = new KDialogBase(
             TQT_TQWIDGET(KApplication::activeModalWidget()),
-    "simplelog",true,TQString(i18n("Logmessage for revision %1").tqarg(bit->rev())),
+    "simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())),
     KDialogBase::Close);
     TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
     KTextBrowser*ptr = new KTextBrowser(Dialog1Layout);
@@ -447,7 +447,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
     int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2;
     KDialogBase * dlg = new KDialogBase(
             TQT_TQWIDGET(KApplication::activeModalWidget()),
-            name,true,TQString(i18n("Blame %1")).tqarg(item),buttons,KDialogBase::Close,false,
+            name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false,
             KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog"));
 
     TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();