Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 0e051a3c83fc5e121be7a0497c823ed9546157eb)

29 files changed, 38 insertions, 38 deletions

diff --git a/kgamma/kcmkgamma/displaynumber.cpp b/kgamma/kcmkgamma/displaynumber.cpp
index dd678716..a992a73f 100644
--- a/kgamma/kcmkgamma/displaynumber.cpp
+++ b/kgamma/kcmkgamma/displaynumber.cpp
@@ -29,7 +29,7 @@ DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \
   setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
   setBackgroundMode(TQt::PaletteBase);
   setAlignment(TQt::AlignCenter);
-  setFocusPolicy(TQ_NoFocus);
+  setFocusPolicy(TQWidget::NoFocus);
 }
 
 DisplayNumber::~DisplayNumber(){
diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp
index 0701c659..1002e123 100644
--- a/kghostview/kgv_view.cpp
+++ b/kghostview/kgv_view.cpp
@@ -109,7 +109,7 @@ KGVPart::KGVPart( TQWidget* parentWidget, const char*,
 
     // Setup main widget
     _mainWidget = new KGVMainWidget( parentWidget );
-    _mainWidget->setFocusPolicy( TQ_StrongFocus );
+    _mainWidget->setFocusPolicy( TQWidget::StrongFocus );
     _mainWidget->installEventFilter( this );
     _mainWidget->setAcceptDrops( true );
     connect( _mainWidget, TQT_SIGNAL( spacePressed() ),
diff --git a/kghostview/kgvpageview.cpp b/kghostview/kgvpageview.cpp
index f725cf03..121f3afe 100644
--- a/kghostview/kgvpageview.cpp
+++ b/kghostview/kgvpageview.cpp
@@ -27,8 +27,8 @@ KGVPageView::KGVPageView( TQWidget* parent, const char* name )
 {
     _page = 0;
 
-    setFocusPolicy( TQ_StrongFocus );
-    viewport()->setFocusPolicy( TQ_WheelFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
+    viewport()->setFocusPolicy( TQWidget::WheelFocus );
 }
 
 void KGVPageView::setPage( TQWidget* page )
diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp
index aa46048b..b5256dfa 100644
--- a/kghostview/viewcontrol.cpp
+++ b/kghostview/viewcontrol.cpp
@@ -28,7 +28,7 @@
 ViewControl::ViewControl( TQWidget *parent, const char *name )
 	: TQDialog( parent, name )
 {
-	setFocusPolicy(TQ_StrongFocus);
+	setFocusPolicy(TQWidget::StrongFocus);
 
 	TQBoxLayout *topLayout = new TQVBoxLayout( this, 10 );
 
diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp
index ced8f825..8c979816 100644
--- a/kolourpaint/kpview.cpp
+++ b/kolourpaint/kpview.cpp
@@ -122,7 +122,7 @@ kpView::kpView (kpDocument *document,
 
 
     setBackgroundMode (TQt::NoBackground);  // no flicker
-    setFocusPolicy (TQ_WheelFocus);
+    setFocusPolicy (TQWidget::WheelFocus);
     setMouseTracking (true);  // mouseMoveEvent's even when no mousebtn down
     setKeyCompression (true);
     setInputMethodEnabled (true);  // ensure using InputMethod
diff --git a/kolourpaint/tools/kptoolresizescale.cpp b/kolourpaint/tools/kptoolresizescale.cpp
index 3ced0735..73e6303c 100644
--- a/kolourpaint/tools/kptoolresizescale.cpp
+++ b/kolourpaint/tools/kptoolresizescale.cpp
@@ -634,7 +634,7 @@ static void toolButtonSetLook (TQToolButton *button,
     button->setUsesTextLabel (true);
     button->setTextLabel (name, false/*no tooltip*/);
     button->setAccel (TQAccel::shortcutKey (name));
-    button->setFocusPolicy (TQ_StrongFocus);
+    button->setFocusPolicy (TQWidget::StrongFocus);
     button->setToggleButton (true);
 }
 
diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp
index 14e6ef83..b12adcf4 100644
--- a/kooka/kookaimage.cpp
+++ b/kooka/kookaimage.cpp
@@ -300,7 +300,7 @@ bool KookaImage::loadTiffDir( const TQString& filename, int no )
 	   float yScalefactor = xReso / yReso;
 	   kdDebug(28000) << "Different resolution x/y, rescaling with factor " << yScalefactor << endl;
 	   /* rescale the image */
-	   *this = smoothScale( imgWidth, int(imgHeight*yScalefactor), TQ_ScaleFree );
+	   *this = smoothScale( imgWidth, int(imgHeight*yScalefactor), TQImage::ScaleFree );
        }
        else
        {
@@ -308,7 +308,7 @@ bool KookaImage::loadTiffDir( const TQString& filename, int no )
 	   float scalefactor = yReso / xReso;
 	   kdDebug(28000) << "Different resolution x/y, rescaling x with factor " << scalefactor << endl;
 	   /* rescale the image */
-	   *this = smoothScale( int(imgWidth*scalefactor), imgHeight, TQ_ScaleFree );
+	   *this = smoothScale( int(imgWidth*scalefactor), imgHeight, TQImage::ScaleFree );
 	   
        }
    }
diff --git a/kooka/kookaprint.cpp b/kooka/kookaprint.cpp
index 2a8cdfba..84f7faed 100644
--- a/kooka/kookaprint.cpp
+++ b/kooka/kookaprint.cpp
@@ -112,7 +112,7 @@ bool KookaPrint::printImage( KookaImage *img )
 
 	kdDebug(28000) << "Scaling to printer size " << newWidth << " x " << newHeight << endl;
 
-	tmpImg = img->smoothScale(newWidth, newHeight, TQ_ScaleFree);
+	tmpImg = img->smoothScale(newWidth, newHeight, TQImage::ScaleFree);
 
         TQSize   sz = tmpImg.size();        // the current image size
         TQSize   maxOnPage = maxPageSize(); // the maximum space on one side
@@ -177,7 +177,7 @@ void KookaPrint::printFittingToPage(KookaImage *img)
 	newHeight = int( double( img->height() ) * hAspect );
     }
     
-    tmpImg = img->smoothScale(newWidth, newHeight, TQ_ScaleFree);
+    tmpImg = img->smoothScale(newWidth, newHeight, TQImage::ScaleFree);
 
     m_painter->drawImage( 0,0, tmpImg );
     
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 97302be4..885383e7 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -207,7 +207,7 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document )
 
     // widget setup: setup focus, accept drops and track mouse
     viewport()->setFocusProxy( this );
-    viewport()->setFocusPolicy( TQ_StrongFocus );
+    viewport()->setFocusPolicy( TQWidget::StrongFocus );
     //viewport()->setPaletteBackgroundColor( TQt::white );
     viewport()->setBackgroundMode( TQt::NoBackground );
     setResizePolicy( Manual );
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index 91a9de8d..adf52f9e 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -24,7 +24,7 @@
 PageViewMessage::PageViewMessage( TQWidget * parent )
     : TQWidget( parent, "pageViewMessage" ), m_timer( 0 )
 {
-    setFocusPolicy( TQ_NoFocus );
+    setFocusPolicy( TQWidget::NoFocus );
     setBackgroundMode( NoBackground );
     setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background));
     // if the layout is LtR, we can safely place it in the right position
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index b443daa5..4d0afb57 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -76,7 +76,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
 
 	// widget setup: can be focused by tab and mouse click (not wheel)
 	viewport()->setFocusProxy( this );
-	viewport()->setFocusPolicy( TQ_StrongFocus );
+	viewport()->setFocusPolicy( TQWidget::StrongFocus );
 	setResizePolicy( Manual );
 	setAcceptDrops( true );
 	setDragAutoScroll( false );
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index b52dfb33..950269ab 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -880,7 +880,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
 
     panner->setOpaqueResize(manager->splitterOpaqueResize());
     panner->setKeepSize(manager->splitterKeepSize());
-    panner->setFocusPolicy( TQ_NoFocus );
+    panner->setFocusPolicy( TQWidget::NoFocus );
     target->applyToWidget( panner );
     applyToWidget( panner );
     target->formerDockPos = target->currentDockPos;
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index dff656d7..c0b9355a 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -292,7 +292,7 @@ PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name
 :TQPushButton( parent, name )
 {
   moveMouse = false;
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 }
 
 PMDockButton_Private::~PMDockButton_Private()
@@ -361,7 +361,7 @@ void PMDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w)
 {
    if (w) {
       TQWidget* embeddedWdg = ((PMDockWidget*)w)->getWidget();
-      if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) {
+      if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) {
          embeddedWdg->setFocus();
       }
    }
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index f2726b37..794aac67 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -143,7 +143,7 @@ PMGLView::PMGLView( PMPart* part, PMViewType t,
    initializeGL( );
 
    setMouseTracking( true );
-   setFocusPolicy( TQ_WheelFocus );
+   setFocusPolicy( TQWidget::WheelFocus );
 
    PMRenderManager* rm = PMRenderManager::theManager( );
    rm->viewCreated( );
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 916e6808..51be79b1 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -75,8 +75,8 @@ PMTreeView::PMTreeView( PMPart* part, TQWidget* parent /*= 0*/,
 
    viewport( )->setAcceptDrops( true );
    viewport( )->setMouseTracking( true );
-   viewport( )->setFocusPolicy( TQ_WheelFocus );
-   setFocusPolicy( TQ_WheelFocus );
+   viewport( )->setFocusPolicy( TQWidget::WheelFocus );
+   setFocusPolicy( TQWidget::WheelFocus );
    setAcceptDrops( true );
 
    connect( part, TQT_SIGNAL( refresh( ) ), TQT_SLOT( slotRefresh( ) ) );
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp
index 8868fbdc..00a1b1ac 100644
--- a/ksnapshot/ksnapshot.cpp
+++ b/ksnapshot/ksnapshot.cpp
@@ -338,7 +338,7 @@ void KSnapshot::slotPrint()
 		neww = newh/h*w;
 	    }
 
-	    img = img.smoothScale( int(neww), int(newh), TQ_ScaleMin );
+	    img = img.smoothScale( int(neww), int(newh), TQImage::ScaleMin );
 	    tqApp->processEvents();
 
 	    int x = (metrics.width()-img.width())/2;
diff --git a/ksnapshot/ksnapshotwidget.ui.h b/ksnapshot/ksnapshotwidget.ui.h
index 55a3c6bb..7fb52539 100644
--- a/ksnapshot/ksnapshotwidget.ui.h
+++ b/ksnapshot/ksnapshotwidget.ui.h
@@ -39,10 +39,10 @@ void KSnapshotWidget::setPreview( const TQPixmap &pm )
     if ( r1 * previewWidth()  < previewHeight() )
         img = img.smoothScale(  previewWidth(),
 				int( previewWidth() * r1 ),
-				TQ_ScaleMin );
+				TQImage::ScaleMin );
     else
         img = img.smoothScale( ( int ) ( ( ( double )previewHeight() ) / r1 ),
-			       previewHeight(), TQ_ScaleMin );
+			       previewHeight(), TQImage::ScaleMin );
 
     TQToolTip::remove( lblImage );
     TQToolTip::add( lblImage,
diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp
index 2e65f012..bd64899c 100644
--- a/ksvg/plugin/ksvg_widget.cpp
+++ b/ksvg/plugin/ksvg_widget.cpp
@@ -31,7 +31,7 @@ KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name)
 : TQWidget(parent, name), m_part(part)
 {
 	setMouseTracking(true);	
-	setFocusPolicy(TQ_WheelFocus);
+	setFocusPolicy(TQWidget::WheelFocus);
 
 	setBackgroundMode(NoBackground);
 
diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp
index 895b5357..db1d362b 100644
--- a/ksvg/test/external/SVGTestWidget.cpp
+++ b/ksvg/test/external/SVGTestWidget.cpp
@@ -18,7 +18,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
 {
 	setBackgroundColor(TQt::white);
 	setMouseTracking(true);	
-	setFocusPolicy(TQ_WheelFocus);
+	setFocusPolicy(TQWidget::WheelFocus);
 
 	m_doc = DocumentFactory::self()->requestDocument(TQT_TQOBJECT(this), TQT_SLOT(slotRenderingFinished()));
 	if(!m_doc)
diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index 91012ac2..2874db06 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -49,7 +49,7 @@ FileFinder::FileFinder( TQWidget *parent, const char *name )
     comp->setReplaceEnv( true );
     setCompletionObject( comp, false );
     setAutoDeleteCompletionObject( true );
-    setFocusPolicy( TQ_ClickFocus );
+    setFocusPolicy( TQWidget::ClickFocus );
 
     TDEConfig *config = TDEGlobal::config();
     TDEConfigGroupSaver cs( config, "GeneralConfiguration" );
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 2c227063..42216dab 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -94,7 +94,7 @@ ImageWindow::~ImageWindow()
 
 void ImageWindow::init()
 {
-    setFocusPolicy( TQ_StrongFocus );
+    setFocusPolicy( TQWidget::StrongFocus );
     
     KCursor::setAutoHideCursor( this, true, true );
     KCursor::setHideCursorDelay( 1500 );
diff --git a/kuickshow/src/kuickimage.cpp b/kuickshow/src/kuickimage.cpp
index db8065f9..1c68bdab 100644
--- a/kuickshow/src/kuickimage.cpp
+++ b/kuickshow/src/kuickimage.cpp
@@ -213,8 +213,8 @@ bool KuickImage::smoothResize( int newWidth, int newHeight )
 //	tqDebug("-- smoothResize: %i x %i", newWidth, newHeight);
 	
 	TQImage *image = newTQImage();
-	// Note: TQ_ScaleMin seems to have a bug (off-by-one, sometimes results in width being 1 pixel too small)
-	TQImage scaledImage = image->smoothScale(newWidth, newHeight, TQ_ScaleFree);
+	// Note: TQImage::ScaleMin seems to have a bug (off-by-one, sometimes results in width being 1 pixel too small)
+	TQImage scaledImage = image->smoothScale(newWidth, newHeight, TQImage::ScaleFree);
 		
 	delete image;
 	
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index 39e78305..8f1c31eb 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -935,7 +935,7 @@ KImageHolder * KImageCanvas::createNewClient()
 	client->setMouseTracking( true );
 	client->installEventFilter( this );
 	setFocusProxy( client );
-	client->setFocusPolicy( TQ_StrongFocus );
+	client->setFocusPolicy( TQWidget::StrongFocus );
 	client->setFocus();
 
 	addChild( client, 0, 0 );
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index ca1c6ca3..e87c214a 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -80,7 +80,7 @@ void KViewKonqExtension::print()
 
 	TQImage imagetoprint;
 	if( printer.option( "app-kviewviewer-fitimage" ) == "1" )
-		imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQ_ScaleMin );
+		imagetoprint = m_pCanvas->image()->smoothScale( metrics.width(), metrics.height(), TQImage::ScaleMin );
 	else
 		imagetoprint = *m_pCanvas->image();
 
diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp
index 619135df..988fda30 100644
--- a/kviewshell/documentWidget.cpp
+++ b/kviewshell/documentWidget.cpp
@@ -83,7 +83,7 @@ DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache
   scrollGuide = -1;
 
   setMouseTracking(true);
-  setFocusPolicy(TQ_ClickFocus);
+  setFocusPolicy(TQWidget::ClickFocus);
 
   connect(&clearStatusBarTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearStatusBar()));
   setBackgroundMode(TQt::NoBackground);
diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp
index c9d2b63f..9ababe46 100644
--- a/kviewshell/kviewpart.cpp
+++ b/kviewshell/kviewpart.cpp
@@ -72,7 +72,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *p
   watch->startScan();
 
   mainWidget = new TQHBox(parentWidget, widgetName);
-  mainWidget->setFocusPolicy(TQ_StrongFocus);
+  mainWidget->setFocusPolicy(TQWidget::StrongFocus);
   setWidget(mainWidget);
 
   // Setup part manager
diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp
index 798f4559..9c2a7dee 100644
--- a/kviewshell/marklist.cpp
+++ b/kviewshell/marklist.cpp
@@ -181,7 +181,7 @@ MarkListWidget::MarkListWidget(TQWidget* _parent, MarkList* _markList, const Pag
   TQBoxLayout* bottomLayout = new TQHBoxLayout(layout);
 
   checkBox = new TQCheckBox(TQString(), this );
-  checkBox->setFocusPolicy(TQ_NoFocus);
+  checkBox->setFocusPolicy(TQWidget::NoFocus);
   TQToolTip::add(checkBox, i18n("Select for printing"));
   bottomLayout->addWidget(checkBox, 0, TQt::AlignAuto);
 
@@ -277,8 +277,8 @@ MarkList::MarkList(TQWidget* parent, const char* name)
 {
   currentPage = PageNumber::invalidPage;
   widgetList.setAutoDelete(true);
-  setFocusPolicy( TQ_StrongFocus );
-  //viewport()->setFocusPolicy( TQ_WheelFocus );
+  setFocusPolicy( TQWidget::StrongFocus );
+  //viewport()->setFocusPolicy( TQWidget::WheelFocus );
   setResizePolicy(TQScrollView::Manual);
 
   setVScrollBarMode(TQScrollView::AlwaysOn);
diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp
index 2be0a51a..f59e197b 100644
--- a/kviewshell/pageView.cpp
+++ b/kviewshell/pageView.cpp
@@ -36,7 +36,7 @@ PageView::PageView( TQWidget* parent, const char* name )
   moveTool = true;
 
   widgetList = 0;
-  viewport()->setFocusPolicy(TQ_StrongFocus);
+  viewport()->setFocusPolicy(TQWidget::StrongFocus);
 
   setResizePolicy(TQScrollView::Manual);
 
diff --git a/kviewshell/tdemultipage.cpp b/kviewshell/tdemultipage.cpp
index 8135cd83..d1f3fc87 100644
--- a/kviewshell/tdemultipage.cpp
+++ b/kviewshell/tdemultipage.cpp
@@ -49,7 +49,7 @@ KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject
   searchInProgress = false;
   
   TQVBox* verticalBox = new TQVBox(parentWidget);
-  verticalBox->setFocusPolicy(TQ_StrongFocus);
+  verticalBox->setFocusPolicy(TQWidget::StrongFocus);
   setWidget(verticalBox);
   
   splitterWidget = new TQSplitter(verticalBox, widgetName);