Replace TQ_*Focus* and TQ_Scale* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a8f627e6d45af521718176586daf0253b4daa597)

8 files changed, 15 insertions, 15 deletions

diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 19377c1b4..e85732431 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -138,7 +138,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
        pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state);
    }
    // Resize to fit button
-   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin));
+   pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin));
    return pxmap;
 }
 
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 0db6bc352..cf63bd697 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
       m_odd(odd),
       m_selected(false)
 {
-    setFocusPolicy(TQ_StrongFocus);
+    setFocusPolicy(TQWidget::StrongFocus);
     setSelected(m_selected);
     
     itemTitle->setText("<h3>" + info.name() + "</h3>");
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 62ff12675..77bccbb0a 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -54,7 +54,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
       m_moveTimer(0, "m_moveTimer"),
       m_dirty(false)
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     setBackgroundMode(NoBackground);
     connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser()));
 
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 971679359..031aed93e 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -138,7 +138,7 @@ void HideButton::generateIcons()
     }
 
     TQImage image = pixmap()->convertToImage();
-    image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
+    image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin);
 
     TDEIconEffect effect;
 
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 4ca9acb81..58be287bb 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -635,7 +635,7 @@ ItemView::ItemView(TQWidget* parent, const char* name)
     setItemMargin(0);
     setSorting(-1);
     setTreeStepSize(38);
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
 
     m_lastOne = 0;
     m_old_contentY = -1;
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index e9329e225..2ef17f3ea 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -283,7 +283,7 @@ void PanelKMenu::initialize()
 	}
         searchEdit = new KPIM::ClickLineEdit( hbox, placeholder );
 
-        hbox->setFocusPolicy(TQ_StrongFocus);
+        hbox->setFocusPolicy(TQWidget::StrongFocus);
         hbox->setFocusProxy(searchEdit);
         hbox->setSpacing( 3 );
         connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear()));
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 500a1c5a2..ca2fc065e 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -331,7 +331,7 @@ KMenu::KMenu()
     m_searchResultsWidget->setItemMargin(4);
 //    m_searchResultsWidget->setIconSize(16);
     m_searchActions = new ItemView (m_searchWidget, "m_searchActions");
-    m_searchActions->setFocusPolicy(TQ_NoFocus);
+    m_searchActions->setFocusPolicy(TQWidget::NoFocus);
     m_searchActions->setItemMargin(4);
     m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet"));
     m_searchInternet->setPixmap(0,icon);
@@ -450,9 +450,9 @@ void KMenu::setupUi()
     m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) );
     m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) );
     m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) );
-   // m_stacker->setFocusPolicy( TQ_StrongFocus );
+   // m_stacker->setFocusPolicy( TQWidget::StrongFocus );
     m_stacker->setLineWidth( 0 );
-    m_stacker->setFocusPolicy(TQ_NoFocus);
+    m_stacker->setFocusPolicy(TQWidget::NoFocus);
     connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*)));
 
     m_kcommand->setName("m_kcommand");
@@ -528,19 +528,19 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         }
 
         if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) {
-            m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus);
+            m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus);
             m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
-                    TQ_StrongFocus : TQ_NoFocus);
+                    TQWidget::StrongFocus : TQWidget::NoFocus);
             setTabOrder(raiseWidget, m_searchResultsWidget);
             if (raiseWidget != m_stacker->visibleWidget()
-                && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus
+                && TQT_TQWIDGET(receiver)->focusPolicy() == TQWidget::NoFocus
                 && m_stacker->id(raiseWidget) >= 0) {
 
                 m_stacker->raiseWidget(raiseWidget);
                 return true;
             }
 
-            if (raiseWidget->focusPolicy() != TQ_NoFocus)
+            if (raiseWidget->focusPolicy() != TQWidget::NoFocus)
                 return false;
         }
 
@@ -2283,7 +2283,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width,
 void KMenu::clearSearchResults(bool showHelp)
 {
     m_searchResultsWidget->clear();
-    m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus);
+    m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus);
     setTabOrder(m_kcommand, m_searchResultsWidget);
 
     if (showHelp) {
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 0a6000f37..99c81ce6d 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -76,7 +76,7 @@ KickerTip::KickerTip(TQWidget * parent)
       m_timer(0, "KickerTip::m_timer"),
       m_frameTimer(0, "KickerTip::m_frameTimer")
 {
-    setFocusPolicy(TQ_NoFocus);
+    setFocusPolicy(TQWidget::NoFocus);
     setBackgroundMode(NoBackground);
     resize(0, 0);
     hide();