1 files changed, 14 insertions, 14 deletions

diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp
index 146ed57b..8626a3e1 100644
--- a/languages/cpp/debugger/gdbbreakpointwidget.cpp
+++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp
@@ -37,7 +37,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -56,7 +56,7 @@ enum Column {
     Control     = 0,
     Enable      = 1,
     Type        = 2,
-    Status      = 3,
+    tqStatus      = 3,
     Location    = 4,
     Condition   = 5,
     IgnoreCount = 6,
@@ -161,7 +161,7 @@ void BreakpointTableRow::setRow()
 
         TQString status=m_breakpoint->statusDisplay(m_activeFlag);
 
-        table()->setText(row(), Status, status);
+        table()->setText(row(), tqStatus, status);
         table()->setText(row(), Condition, m_breakpoint->conditional());
         table()->setText(row(), IgnoreCount, TQString::number(m_breakpoint->ignoreCount() ));
         table()->setText(row(), Hits, TQString::number(m_breakpoint->hits() ));
@@ -183,7 +183,7 @@ void BreakpointTableRow::setRow()
 
         table()->setText(row(), Type, displayType);
         table()->adjustColumn(Type);
-        table()->adjustColumn(Status);
+        table()->adjustColumn(tqStatus);
         table()->adjustColumn(Location);
         table()->adjustColumn(Hits);
         table()->adjustColumn(IgnoreCount);
@@ -208,7 +208,7 @@ controller_(controller)
 
     m_table->hideColumn(Control);
     m_table->setColumnReadOnly(Type, true);
-    m_table->setColumnReadOnly(Status, true);
+    m_table->setColumnReadOnly(tqStatus, true);
     m_table->setColumnReadOnly(Hits, true);
     m_table->setColumnWidth( Enable, 20);
 
@@ -216,7 +216,7 @@ controller_(controller)
 
     header->setLabel( Enable,       "" );
     header->setLabel( Type,         i18n("Type") );
-    header->setLabel( Status,       i18n("Status") );
+    header->setLabel( tqStatus,       i18n("Status") );
     header->setLabel( Location,     i18n("Location") );
     header->setLabel( Condition,    i18n("Condition") );
     header->setLabel( IgnoreCount,  i18n("Ignore Count") );
@@ -377,10 +377,10 @@ void GDBBreakpointWidget::slotWatchpointHit(int id,
              "Address: 0x%2<br>"
              "Old value: %3<br>"
              "New value: %4")
-        .arg(b->varName())
-        .arg(b->address(), 0, 16)
-        .arg(oldValue)
-        .arg(newValue));
+        .tqarg(b->varName())
+        .tqarg(b->address(), 0, 16)
+        .tqarg(oldValue)
+        .tqarg(newValue));
 }
 
 /***************************************************************************/
@@ -1213,7 +1213,7 @@ TQWidget* ComplexEditCell::createEditor() const
 {
     TQHBox* box = new TQHBox( table()->viewport() );
     box->setPaletteBackgroundColor(
-               table()->palette().active().highlight());
+               table()->tqpalette().active().highlight());
 
     label_ = new TQLabel(text(), box, "label");
     label_->setBackgroundMode(TQt::PaletteHighlight);
@@ -1225,16 +1225,16 @@ TQWidget* ComplexEditCell::createEditor() const
     TQPalette p = label_->palette();
 
     p.setColor(TQPalette::Active, TQColorGroup::Foreground,
-               table()->palette().active().highlightedText());
+               table()->tqpalette().active().highlightedText());
     p.setColor(TQPalette::Inactive, TQColorGroup::Foreground,
-               table()->palette().active().highlightedText());
+               table()->tqpalette().active().highlightedText());
 
     label_->setPalette(p);
 
     TQPushButton* b = new TQPushButton("...", box);
     // This is exactly what is done in TQDesigner source in the
     // similar context. Haven't had any success making the good look
-    // with layout, I suppose that sizeHint for button is always larger
+    // with tqlayout, I suppose that tqsizeHint for button is always larger
     // than 20.
     b->setFixedWidth( 20 );