Replace TQ_*Focus* and TQ_Scale* defines

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

34 files changed, 48 insertions, 48 deletions

diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index a65adf39f..1e866bda9 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -224,7 +224,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons
     m_shuttingDown = false;
     m_displayingAboutPage = false;
     m_currentFrame = 0L;
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
 
     TQVBoxLayout *lt = new TQVBoxLayout( this );
 
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 566ffd713..ec815ff67 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -51,7 +51,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa
 
   // create a canvas to insert our widget
   TQWidget *canvas = new TQWidget( parentWidget, widgetName );
-  canvas->setFocusPolicy( TQ_ClickFocus );
+  canvas->setFocusPolicy( TQWidget::ClickFocus );
   setWidget( canvas );
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( canvas );
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 9b1ef52a6..ecff84143 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -587,7 +587,7 @@ CardView::CardView( TQWidget *parent, const char *name )
 
   viewport()->setMouseTracking( true );
   viewport()->setFocusProxy( this );
-  viewport()->setFocusPolicy(TQ_WheelFocus );
+  viewport()->setFocusPolicy(TQWidget::WheelFocus );
   viewport()->setBackgroundMode( PaletteBase );
 
   connect( d->mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryShowFullText() ) );
diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp
index d6b02373c..b4b56bc18 100644
--- a/kalarm/lib/checkbox.cpp
+++ b/kalarm/lib/checkbox.cpp
@@ -44,7 +44,7 @@ void CheckBox::setReadOnly(bool ro)
 	if ((int)ro != (int)mReadOnly)
 	{
 		mReadOnly = ro;
-		setFocusPolicy(ro ? TQ_NoFocus : mFocusPolicy);
+		setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
 		if (ro)
 			clearFocus();
 	}
diff --git a/kalarm/lib/checkbox.h b/kalarm/lib/checkbox.h
index 9d47d5047..eb9afc88a 100644
--- a/kalarm/lib/checkbox.h
+++ b/kalarm/lib/checkbox.h
@@ -80,7 +80,7 @@ class CheckBox : public TQCheckBox
 	protected slots:
 		void         slotClicked();
 	private:
-		TQ_FocusPolicy mFocusPolicy;       // default focus policy for the TQCheckBox
+		TQWidget::FocusPolicy mFocusPolicy;       // default focus policy for the TQCheckBox
 		TQWidget*             mFocusWidget;       // widget to receive focus when button is clicked on
 		bool                 mFocusWidgetEnable; // enable focus widget before setting focus
 		bool                 mReadOnly;          // value cannot be changed
diff --git a/kalarm/lib/label.cpp b/kalarm/lib/label.cpp
index 891213c57..f2aa91b53 100644
--- a/kalarm/lib/label.cpp
+++ b/kalarm/lib/label.cpp
@@ -106,7 +106,7 @@ void Label::activated()
 LabelFocusWidget::LabelFocusWidget(TQWidget* parent, const char* name)
 	: TQWidget(parent, name)
 {
-	setFocusPolicy(TQ_ClickFocus);
+	setFocusPolicy(TQWidget::ClickFocus);
 	setFixedSize(TQSize(1,1));
 }
 
diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp
index f1f824d24..be39e801a 100644
--- a/kalarm/lib/pushbutton.cpp
+++ b/kalarm/lib/pushbutton.cpp
@@ -44,7 +44,7 @@ void PushButton::setReadOnly(bool ro)
 	if ((int)ro != (int)mReadOnly)
 	{
 		mReadOnly = ro;
-		setFocusPolicy(ro ? TQ_NoFocus : mFocusPolicy);
+		setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
 		if (ro)
 			clearFocus();
 	}
diff --git a/kalarm/lib/pushbutton.h b/kalarm/lib/pushbutton.h
index 634f8d890..091060af2 100644
--- a/kalarm/lib/pushbutton.h
+++ b/kalarm/lib/pushbutton.h
@@ -71,7 +71,7 @@ class PushButton : public TQPushButton
 		virtual void keyPressEvent(TQKeyEvent*);
 		virtual void keyReleaseEvent(TQKeyEvent*);
 	private:
-		TQ_FocusPolicy mFocusPolicy;   // default focus policy for the TQPushButton
+		TQWidget::FocusPolicy mFocusPolicy;   // default focus policy for the TQPushButton
 		bool                 mReadOnly;      // value cannot be changed
 };
 
diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp
index 18571ad7f..8eae0825e 100644
--- a/kalarm/lib/radiobutton.cpp
+++ b/kalarm/lib/radiobutton.cpp
@@ -44,7 +44,7 @@ void RadioButton::setReadOnly(bool ro)
 	if ((int)ro != (int)mReadOnly)
 	{
 		mReadOnly = ro;
-		setFocusPolicy(ro ? TQ_NoFocus : mFocusPolicy);
+		setFocusPolicy(ro ? TQWidget::NoFocus : mFocusPolicy);
 		if (ro)
 			clearFocus();
 	}
diff --git a/kalarm/lib/radiobutton.h b/kalarm/lib/radiobutton.h
index c6d95fbc8..d3b477854 100644
--- a/kalarm/lib/radiobutton.h
+++ b/kalarm/lib/radiobutton.h
@@ -80,7 +80,7 @@ class RadioButton : public TQRadioButton
 	protected slots:
 		void         slotClicked();
 	private:
-		TQ_FocusPolicy mFocusPolicy;       // default focus policy for the TQRadioButton
+		TQWidget::FocusPolicy mFocusPolicy;       // default focus policy for the TQRadioButton
 		TQWidget*             mFocusWidget;       // widget to receive focus when button is clicked on
 		bool                 mFocusWidgetEnable; // enable focus widget before setting focus
 		bool                 mReadOnly;          // value cannot be changed
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
index 5572cb953..43570dbad 100644
--- a/kalarm/lib/spinbox2.cpp
+++ b/kalarm/lib/spinbox2.cpp
@@ -85,7 +85,7 @@ void SpinBox2::init()
 	mSpinbox->setSelectOnStep(false);    // default
 	mUpdown2->setSelectOnStep(false);    // always false
 	setFocusProxy(mSpinbox);
-	mUpdown2->setFocusPolicy(TQ_NoFocus);
+	mUpdown2->setFocusPolicy(TQWidget::NoFocus);
 	mSpinMirror = new SpinMirror(mUpdown2, mUpdown2Frame, this);
 	if (!mirrorStyle(style()))
 		mSpinMirror->hide();    // hide mirrored spin buttons when they are inappropriate
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 293d92b02..3082c449e 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -510,7 +510,7 @@ void MessageWin::initView()
 	mOkButton = new KPushButton(KStdGuiItem::close(), topWidget);
 	// Prevent accidental acknowledgement of the message if the user is typing when the window appears
 	mOkButton->clearFocus();
-	mOkButton->setFocusPolicy(TQ_ClickFocus);    // don't allow keyboard selection
+	mOkButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
 	mOkButton->setFixedSize(mOkButton->sizeHint());
 	connect(mOkButton, TQT_SIGNAL(clicked()), TQT_SLOT(close()));
 	grid->addWidget(mOkButton, 0, gridIndex++, AlignHCenter);
@@ -520,7 +520,7 @@ void MessageWin::initView()
 	{
 		// Edit button
 		mEditButton = new TQPushButton(i18n("&Edit..."), topWidget);
-		mEditButton->setFocusPolicy(TQ_ClickFocus);    // don't allow keyboard selection
+		mEditButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
 		mEditButton->setFixedSize(mEditButton->sizeHint());
 		connect(mEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit()));
 		grid->addWidget(mEditButton, 0, gridIndex++, AlignHCenter);
@@ -531,7 +531,7 @@ void MessageWin::initView()
 	{
 		// Defer button
 		mDeferButton = new TQPushButton(i18n("&Defer..."), topWidget);
-		mDeferButton->setFocusPolicy(TQ_ClickFocus);    // don't allow keyboard selection
+		mDeferButton->setFocusPolicy(TQWidget::ClickFocus);    // don't allow keyboard selection
 		mDeferButton->setFixedSize(mDeferButton->sizeHint());
 		connect(mDeferButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefer()));
 		grid->addWidget(mDeferButton, 0, gridIndex++, AlignHCenter);
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 4a61ed667..111332531 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -712,7 +712,7 @@ void RecurrenceEdit::enableExceptionButtons()
 		mChangeExceptionButton->setEnabled(enable);
 
 	// Prevent the exceptions list box receiving keyboard focus is it's empty
-	mExceptionDateList->setFocusPolicy(mExceptionDateList->count() ? TQ_WheelFocus : TQ_NoFocus);
+	mExceptionDateList->setFocusPolicy(mExceptionDateList->count() ? TQWidget::WheelFocus : TQWidget::NoFocus);
 }
 
 /******************************************************************************
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 2c3a348ef..d1d620364 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -88,7 +88,7 @@ xQGanttBarViewPort::xQGanttBarViewPort(KGanttItem* toplevelitem,
 
   recalc(); adjustSize();
 
-  setFocusPolicy(TQ_StrongFocus);
+  setFocusPolicy(TQWidget::StrongFocus);
   _mode = Init;
 
 }
diff --git a/kmail/folderrequester.cpp b/kmail/folderrequester.cpp
index f2f7ec162..51fdd7906 100644
--- a/kmail/folderrequester.cpp
+++ b/kmail/folderrequester.cpp
@@ -57,7 +57,7 @@ FolderRequester::FolderRequester( TQWidget *parent, KMFolderTree *tree )
 
   setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding,
         TQSizePolicy::Fixed ) );
-  setFocusPolicy( TQ_StrongFocus );
+  setFocusPolicy( TQWidget::StrongFocus );
 }
 
 //-----------------------------------------------------------------------------
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 4d6654224..79eb175c7 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -99,7 +99,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 
   // create a canvas to insert our widget
   TQWidget *canvas = new TQWidget(parentWidget, widgetName);
-  canvas->setFocusPolicy(TQ_ClickFocus);
+  canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
   TDEGlobal::iconLoader()->addAppDir("kmail");
 #if 0
@@ -124,7 +124,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
                                  kapp->config());
   TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
   topLayout->addWidget(mainWidget);
-  mainWidget->setFocusPolicy(TQ_ClickFocus);
+  mainWidget->setFocusPolicy(TQWidget::ClickFocus);
   mStatusBar  = new KMailStatusBarExtension(this);
   mStatusBar->addStatusBarItem( mainWidget->vacationScriptIndicator(), 2, false );
 
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 3694e4af3..f9b3a884a 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -249,10 +249,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     TQToolTip::add( mBtnCc, tip );
     TQToolTip::add( mBtnBcc, tip );
 
-    mBtnTo->setFocusPolicy(TQ_NoFocus);
-    mBtnCc->setFocusPolicy(TQ_NoFocus);
-    mBtnBcc->setFocusPolicy(TQ_NoFocus);
-    //mBtnFrom->setFocusPolicy(TQ_NoFocus);
+    mBtnTo->setFocusPolicy(TQWidget::NoFocus);
+    mBtnCc->setFocusPolicy(TQWidget::NoFocus);
+    mBtnBcc->setFocusPolicy(TQWidget::NoFocus);
+    //mBtnFrom->setFocusPolicy(TQWidget::NoFocus);
 
     connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
     connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
@@ -385,10 +385,10 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   setCaption( i18n("Composer") );
   setMinimumSize(200,200);
 
-  mBtnIdentity->setFocusPolicy(TQ_NoFocus);
-  mBtnFcc->setFocusPolicy(TQ_NoFocus);
-  mBtnTransport->setFocusPolicy(TQ_NoFocus);
-  mBtnDictionary->setFocusPolicy( TQ_NoFocus );
+  mBtnIdentity->setFocusPolicy(TQWidget::NoFocus);
+  mBtnFcc->setFocusPolicy(TQWidget::NoFocus);
+  mBtnTransport->setFocusPolicy(TQWidget::NoFocus);
+  mBtnDictionary->setFocusPolicy( TQWidget::NoFocus );
 
   mAtmListView = new AttachmentListView( this, mSplitter,
                                          "attachment list view" );
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 14419a170..116b2e575 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -143,7 +143,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
   connect(mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleColumn(int)));
 
   setShowSortIndicator(true);
-  setFocusPolicy( TQ_WheelFocus );
+  setFocusPolicy( TQWidget::WheelFocus );
 
   if (!pixmapsLoaded)
   {
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 00a71a78b..f0ae76c5f 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1000,7 +1000,7 @@ void KMReaderWin::writeConfig( bool sync ) const {
 //-----------------------------------------------------------------------------
 void KMReaderWin::initHtmlWidget(void)
 {
-  mViewer->widget()->setFocusPolicy(TQ_WheelFocus);
+  mViewer->widget()->setFocusPolicy(TQWidget::WheelFocus);
   // Let's better be paranoid and disable plugins (it defaults to enabled):
   mViewer->setPluginsEnabled(false);
   mViewer->setJScriptEnabled(false); // just make this explicit
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index be47b022b..e549c789c 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -103,7 +103,7 @@ void RecipientItem::setAddressee( const TDEABC::Addressee &a,
 
   TQImage img = a.photo().data();
   if ( !img.isNull() )
-    mIcon = img.smoothScale( 20, 20, TQ_ScaleMin );
+    mIcon = img.smoothScale( 20, 20, TQImage::ScaleMin );
   else
     mIcon = TDEGlobal::iconLoader()->loadIcon( "preferences-desktop-personal", TDEIcon::Small );
 
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 1b5b3b9a3..73b755141 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -98,13 +98,13 @@ ArticleWidget::ArticleWidget( TQWidget *parent,
   TQHBoxLayout *box = new TQHBoxLayout( this );
   mViewer = new TDEHTMLPart( this, "mViewer" );
   box->addWidget( mViewer->widget() );
-  mViewer->widget()->setFocusPolicy( TQ_WheelFocus );
+  mViewer->widget()->setFocusPolicy( TQWidget::WheelFocus );
   mViewer->setPluginsEnabled( false );
   mViewer->setJScriptEnabled( false );
   mViewer->setJavaEnabled( false );
   mViewer->setMetaRefreshEnabled( false );
   mViewer->setOnlyLocalReferences( true );
-  mViewer->view()->setFocusPolicy( TQ_WheelFocus );
+  mViewer->view()->setFocusPolicy( TQWidget::WheelFocus );
   connect( mViewer->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)),
            TQT_SLOT(slotURLClicked(const KURL&)) );
   connect( mViewer, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)),
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index c5169a5b3..028a267d3 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -68,13 +68,13 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
 
   // create a canvas to insert our widget
   TQWidget *canvas = new TQWidget(parentWidget, widgetName);
-  canvas->setFocusPolicy(TQ_ClickFocus);
+  canvas->setFocusPolicy(TQWidget::ClickFocus);
   setWidget(canvas);
 
   mainWidget = new KNMainWidget( this, false, canvas, "knode_widget" );
   TQVBoxLayout *topLayout = new TQVBoxLayout(canvas);
   topLayout->addWidget(mainWidget);
-  mainWidget->setFocusPolicy(TQ_ClickFocus);
+  mainWidget->setFocusPolicy(TQWidget::ClickFocus);
 
   kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests.
 
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index ff89b2dea..5bee8384c 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -33,7 +33,7 @@
 KNoteButton::KNoteButton( const TQString& icon, TQWidget *parent, const char *name )
     : TQPushButton( parent, name )
 {
-    setFocusPolicy( TQ_NoFocus );
+    setFocusPolicy( TQWidget::NoFocus );
     setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
     m_flat = true;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 6192dd4c4..0238647e4 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -89,7 +89,7 @@ void Summary::mouseMoveEvent( TQMouseEvent *event )
 
     TQPixmap pm = TQPixmap::grabWidget( this );
     if ( pm.width() > 300 )
-      pm = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin );
+      pm = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
 
     TQPainter painter;
     painter.begin( &pm );
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 94474c55f..ddb43d71a 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -364,7 +364,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mMainWidget = new TQFrame( sv->viewport() );
   sv->addChild( mMainWidget );
   mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-  sv->setFocusPolicy( TQ_StrongFocus );
+  sv->setFocusPolicy( TQWidget::StrongFocus );
   setWidget( sv );
 
   mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(),
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 338aeb8d6..e3560ed74 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -265,7 +265,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
   setHScrollBarMode( TQScrollView::AlwaysOff );
   setAcceptDrops( true );
 
-  setFocusPolicy( TQ_NoFocus );
+  setFocusPolicy( TQWidget::NoFocus );
 
   connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
            TQT_SLOT( slotExecuted( TQListBoxItem* ) ) );
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 1fd7ab881..f89d5e450 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -313,7 +313,7 @@ void MainWindow::initAboutScreen()
   mPartsStack->addWidget( introbox );
   mPartsStack->raiseWidget( introbox );
   mIntroPart = new TDEHTMLPart( introbox );
-  mIntroPart->widget()->setFocusPolicy( TQ_WheelFocus );
+  mIntroPart->widget()->setFocusPolicy( TQWidget::WheelFocus );
   // Let's better be paranoid and disable plugins (it defaults to enabled):
   mIntroPart->setPluginsEnabled( false );
   mIntroPart->setJScriptEnabled( false ); // just make this explicit
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 7ced83b36..e7d4ea3b2 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -255,7 +255,7 @@ void KOAgenda::init()
 
   // Grab key strokes for keyboard navigation of agenda. Seems to have no
   // effect. Has to be fixed.
-  setFocusPolicy( TQ_WheelFocus );
+  setFocusPolicy( TQWidget::WheelFocus );
 
   connect( &mScrollUpTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollUp() ) );
   connect( &mScrollDownTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( scrollDown() ) );
@@ -291,7 +291,7 @@ void KOAgenda::init()
 
   viewport()->update();
   viewport()->setBackgroundMode( NoBackground );
-  viewport()->setFocusPolicy( TQ_WheelFocus );
+  viewport()->setFocusPolicy( TQWidget::WheelFocus );
 
   setMinimumSize( 30, int( mGridSpacingY + 1 ) );
 //  setMaximumHeight(mGridSpacingY * mRows + 5);
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 1b607169c..b318dc982 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -81,7 +81,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
 
   // create a canvas to insert our widget
   TQWidget *canvas = new TQWidget( parentWidget, widgetName );
-  canvas->setFocusPolicy( TQ_ClickFocus );
+  canvas->setFocusPolicy( TQWidget::ClickFocus );
   setWidget( canvas );
   mView = new CalendarView( canvas );
 
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index bc6f8839a..152790c7e 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -225,12 +225,12 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch,
   mUpButton = new KPushButton( upDownBox, "mUpButton" );
   mUpButton->setIconSet( BarIconSet( "go-up", TDEIcon::SizeSmall ) );
   mUpButton->setEnabled( false ); // b/c no item is selected yet
-  mUpButton->setFocusPolicy( TQ_StrongFocus );
+  mUpButton->setFocusPolicy( TQWidget::StrongFocus );
 
   mDownButton = new KPushButton( upDownBox, "mDownButton" );
   mDownButton->setIconSet( BarIconSet( "go-down", TDEIcon::SizeSmall ) );
   mDownButton->setEnabled( false ); // b/c no item is selected yet
-  mDownButton->setFocusPolicy( TQ_StrongFocus );
+  mDownButton->setFocusPolicy( TQWidget::StrongFocus );
 
   TQWidget* spacer = new TQWidget( upDownBox );
   upDownBox->setStretchFactor( spacer, 100 );
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index 02a985b7a..050202b66 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -67,7 +67,7 @@ class PageItem : public TQCheckListItem
         setText( 0, wdg->caption() );
 
         TQPixmap pm = TQPixmap::grabWidget( wdg );
-        TQImage img = pm.convertToImage().smoothScale( 300, 300, TQ_ScaleMin );
+        TQImage img = pm.convertToImage().smoothScale( 300, 300, TQImage::ScaleMin );
         mPreview = img;
 
         TQObjectList *list = wdg->queryList( "TQWidget" );
diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp
index fa93fe3d5..b407ea6e3 100644
--- a/libtdepim/kpixmapregionselectorwidget.cpp
+++ b/libtdepim/kpixmapregionselectorwidget.cpp
@@ -429,7 +429,7 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, int height)
    {
          /* We have to resize the pixmap to get it complete on the screen */
          TQImage image=m_originalPixmap.convertToImage();
-         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQ_ScaleMin ) );
+         m_originalPixmap.convertFromImage( image.smoothScale( width, height, TQImage::ScaleMin ) );
          //m_originalPixmap.convertFromImage( KImageEffect::sample( image, width, height ) );
          double oldZoomFactor = m_zoomFactor;
          m_zoomFactor=m_originalPixmap.width()/(double)m_unzoomedPixmap.width();
diff --git a/libtdepim/ktimeedit.cpp b/libtdepim/ktimeedit.cpp
index edb871e86..6451c65b9 100644
--- a/libtdepim/ktimeedit.cpp
+++ b/libtdepim/ktimeedit.cpp
@@ -126,7 +126,7 @@ KTimeEdit::KTimeEdit( TQWidget *parent, TQTime qt, const char *name )
   insertItem( TDEGlobal::locale()->formatTime( TQTime( 23, 59, 59 ) ) );
 
   updateText();
-  setFocusPolicy(TQ_StrongFocus);
+  setFocusPolicy(TQWidget::StrongFocus);
 
   connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(active(int)));
   connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(hilit(int)));
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index 8474ed21d..11eedfe52 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -217,7 +217,7 @@ void tqt_leave_modal( TQWidget *widget );
 void ResourceGroupwareBase::enter_loop()
 {
   TQWidget dummy(0,0,WType_Dialog | WShowModal);
-  dummy.setFocusPolicy( TQ_NoFocus );
+  dummy.setFocusPolicy( TQWidget::NoFocus );
   tqt_enter_modal(&dummy);
   tqApp->enter_loop();
   tqt_leave_modal(&dummy);