1 files changed, 6 insertions, 6 deletions

diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp
index b7e2d68a..4056431e 100644
--- a/kommander/widgets/table.cpp
+++ b/kommander/widgets/table.cpp
@@ -48,7 +48,7 @@ enum Functions {
 
 
 Table::Table(TQWidget *a_parent, const char *a_name)
-  : TQTable(a_parent, a_name), KommanderWidget(this)
+  : TQTable(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this))
 {
   TQStringList states;
   states << "default";
@@ -114,7 +114,7 @@ void Table::setWidgetText(const TQString&)
 TQString Table::selectedArea()
 {
   TQTableSelection sel = selection(currentSelection());
-  return TQString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(sel.rightCol());
+  return TQString("%1,%2,%3,%4").tqarg(sel.topRow()).tqarg(sel.leftCol()).tqarg(sel.bottomRow()).tqarg(sel.rightCol());
 }
 
 
@@ -123,7 +123,7 @@ bool Table::isFunctionSupported(int f)
   return f == DCOP::currentColumn || f == DCOP::currentRow || f == DCOP::insertColumn || 
       f == DCOP::insertRow || f == DCOP::cellText || f == DCOP::setCellText || f == DCOP::setCellWidget || f == DCOP::cellWidget || f == DCOP::columnCount ||
       f == DCOP::removeRow || f == DCOP::removeColumn || f == DCOP::setColumnCaption ||
-      f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f >= FirstFunction && f <= LastFunction);
+      f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::tqgeometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor  || (f >= FirstFunction && f <= LastFunction);
 }
 
 void Table::setCellWidget(int row, int col, const TQString & _widgetName)
@@ -131,7 +131,7 @@ void Table::setCellWidget(int row, int col, const TQString & _widgetName)
   KommanderWidget *w = widgetByName(_widgetName);
   if (w)
   {
-    TQWidget *widget = static_cast<TQWidget*>(w->object());
+    TQWidget *widget = TQT_TQWIDGET(w->object());
     if (TQTable::cellWidget(row, col) != widget)
     { 
       setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. 
@@ -167,7 +167,7 @@ void Table::setCellText(int row, int col, const TQString& text)
   {
     KommanderWidget *w = widgetByName(widget->name());
     if (w)
-      widget->reparent(parentDialog(), TQPoint(0,0));
+      widget->reparent(tqparentDialog(), TQPoint(0,0));
   }  
   setText(row, col, text);
   endEdit(row, col, false, false);
@@ -354,7 +354,7 @@ TQString Table::handleDCOP(int function, const TQStringList& args)
         return "No row at index "+args[0];
       break;
     }
-    case DCOP::geometry:
+    case DCOP::tqgeometry:
     {
       TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height());
       return geo;