1 files changed, 13 insertions, 13 deletions

diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp
index cb60152..c43dcbb 100644
--- a/kregexpeditor/compoundwidget.cpp
+++ b/kregexpeditor/compoundwidget.cpp
@@ -26,7 +26,7 @@
 #endif
 
 #include "compoundwidget.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcursor.h>
 #include <tqlineedit.h>
 #include <tqpainter.h>
@@ -40,8 +40,8 @@
 CompoundDetailWindow::CompoundDetailWindow( TQWidget* parent, const char* name )
   :TQWidget( parent, name )
 {
-  TQVBoxLayout* layout = new TQVBoxLayout( this );
-  layout->setAutoAdd( true );
+  TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+  tqlayout->setAutoAdd( true );
 
   TQLabel* label = new TQLabel( i18n("&Title:"), this);
   _title = new TQLineEdit( this );
@@ -135,10 +135,10 @@ void CompoundWidget::init( )
   _backRefId = -1;
 }
 
-TQSize CompoundWidget::sizeHint() const
+TQSize CompoundWidget::tqsizeHint() const
 {
   TQFontMetrics metrics = fontMetrics();
-  _childSize = _child->sizeHint();
+  _childSize = _child->tqsizeHint();
   _textSize = metrics.size( 0, _content->title() );
 
   int width, height;
@@ -164,7 +164,7 @@ TQSize CompoundWidget::sizeHint() const
 
 void CompoundWidget::paintEvent( TQPaintEvent *e )
 {
-  TQSize mySize = sizeHint();
+  TQSize mySize = tqsizeHint();
 
   TQPainter painter(this);
   drawPossibleSelection( painter, mySize);
@@ -220,8 +220,8 @@ void CompoundWidget::paintEvent( TQPaintEvent *e )
   }
   else {
     TQSize curSize = _child->size();
-    TQSize newSize = TQSize( TQMAX( _child->sizeHint().width(), mySize.width()-2*pw),
-                           _child->sizeHint().height());
+    TQSize newSize = TQSize( TQMAX( _child->tqsizeHint().width(), mySize.width()-2*pw),
+                           _child->tqsizeHint().height());
 
     _child->move( pw, childY );
     if ( curSize != newSize ) {
@@ -247,7 +247,7 @@ void CompoundWidget::slotConfigCanceled()
   TQDataStream stream( _backup, IO_ReadOnly );
   KWidgetStreamer streamer;
   streamer.fromStream( stream, TQT_TQOBJECT(_content) );
-  repaint();
+  tqrepaint();
 }
 
 RegExp* CompoundWidget::regExp() const
@@ -273,7 +273,7 @@ void CompoundWidget::mouseReleaseEvent( TQMouseEvent* event)
        TQRect( _pixmapPos, _pixmapSize ).contains( event->pos() ) ) {
     _hidden = !_hidden;
     _editorWindow->updateContent( 0 );
-    repaint(); // is this necesary?
+    tqrepaint(); // is this necesary?
     _editorWindow->emitChange();
   }
   else
@@ -286,7 +286,7 @@ bool CompoundWidget::updateSelection( bool parentSelected )
     bool changed = RegExpWidget::updateSelection( parentSelected );
     _child->selectWidget( _isSelected );
     if (changed)
-      repaint();
+      tqrepaint();
     return changed;
   }
   else {
@@ -296,8 +296,8 @@ bool CompoundWidget::updateSelection( bool parentSelected )
 
 int CompoundWidget::edit()
 {
-  _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2,
-                                              _configWindow->sizeHint().height()/2)  );
+  _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2,
+                                              _configWindow->tqsizeHint().height()/2)  );
   TQDataStream stream( _backup, IO_WriteOnly );
   KWidgetStreamer streamer;
   streamer.toStream( TQT_TQOBJECT(_content), stream );