1 files changed, 11 insertions, 11 deletions
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index fe2da6e1..00a50692 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -33,7 +33,7 @@
 #include <tqdialog.h>
 #include <tqevent.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollbar.h>
 
 #include <kdebug.h>
@@ -290,13 +290,13 @@ KigView::KigView( KigPart* part,
                   TQWidget* parent,
                   const char* name )
   : TQWidget( parent, name ),
-    mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
+    mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
     mupdatingscrollbars( false ),
     mrealwidget( 0 ), mpart( part )
 {
   connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) );
 
-  mtqlayout = new TQGridLayout( this, 2, 2 );
+  mlayout = new TQGridLayout( this, 2, 2 );
   mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" );
   // TODO: make this configurable...
   mrightscroll->setTracking( true );
@@ -310,11 +310,11 @@ KigView::KigView( KigPart* part,
   connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ),
            this, TQT_SLOT( updateScrollBars() ) );
   mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen );
-  mtqlayout->addWidget( mbottomscroll, 1, 0 );
-  mtqlayout->addWidget( mrealwidget, 0, 0 );
-  mtqlayout->addWidget( mrightscroll, 0, 1 );
+  mlayout->addWidget( mbottomscroll, 1, 0 );
+  mlayout->addWidget( mrealwidget, 0, 0 );
+  mlayout->addWidget( mrightscroll, 0, 1 );
 
-  resize( tqsizeHint() );
+  resize( sizeHint() );
   mrealwidget->recenterScreen();
   part->redrawScreen( mrealwidget );
   updateScrollBars();
@@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const
   return mpart->document();
 }
 
-TQSize KigWidget::tqsizeHint() const
+TQSize KigWidget::sizeHint() const
 {
   return TQSize( 630, 450 );
 }
@@ -508,9 +508,9 @@ void KigView::toggleFullScreen()
 {
   mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() );
   if ( mrealwidget->isFullScreen() )
-    tqtopLevelWidget()->showFullScreen();
+    topLevelWidget()->showFullScreen();
   else
-    tqtopLevelWidget()->showNormal();
+    topLevelWidget()->showNormal();
 }
 
 void KigWidget::setFullScreen( bool f )
@@ -568,7 +568,7 @@ void KigWidget::zoomArea()
   KigInputDialog::getTwoCoordinates( i18n( "Select Zoom Area" ),
         i18n( "Select the zoom area by entering the coordinates of "
               "the upper left corner and the lower right corner." ) +
-        TQString::tqfromLatin1("<br>") +
+        TQString::fromLatin1("<br>") +
         mpart->document().coordinateSystem().coordinateFormatNoticeMarkup(),
         this, &ok, mpart->document(), &tl, &br );
   if ( ok )