diff options
Diffstat (limited to 'kicker/applets/launcher')
| -rw-r--r-- | kicker/applets/launcher/configdlg.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/launcher/configdlg.h | 2 | ||||
| -rw-r--r-- | kicker/applets/launcher/flowgridmanager.cpp | 16 | ||||
| -rw-r--r-- | kicker/applets/launcher/flowgridmanager.h | 8 | ||||
| -rw-r--r-- | kicker/applets/launcher/quickaddappsmenu.cpp | 12 | ||||
| -rw-r--r-- | kicker/applets/launcher/quickaddappsmenu.h | 2 | ||||
| -rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 40 | ||||
| -rw-r--r-- | kicker/applets/launcher/quickbutton.h | 2 | ||||
| -rw-r--r-- | kicker/applets/launcher/quickbuttongroup.h | 10 | ||||
| -rw-r--r-- | kicker/applets/launcher/quicklauncher.cpp | 46 | ||||
| -rw-r--r-- | kicker/applets/launcher/quicklauncher.h | 2 | 
11 files changed, 72 insertions, 72 deletions
diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index d542d2593..88301b7cf 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config,          m_ui->iconDim->insertItem(TQString::number(              m_settings->iconDimChoices()[n]));      } -    connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)), -            this, TQT_SLOT(updateButtons())); +    connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)), +            this, TQ_SLOT(updateButtons()));      updateWidgets();      m_oldIconDimText = m_ui->iconDim->currentText();      updateButtons(); diff --git a/kicker/applets/launcher/configdlg.h b/kicker/applets/launcher/configdlg.h index b96caf459..14fda2cac 100644 --- a/kicker/applets/launcher/configdlg.h +++ b/kicker/applets/launcher/configdlg.h @@ -31,7 +31,7 @@ class Prefs;  class ConfigDlg : public TDEConfigDialog  { -    Q_OBJECT +    TQ_OBJECT  public:      ConfigDlg(TQWidget *parent, const char *name, Prefs *config, int autoSize, diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp index 46c79a857..5172b4eee 100644 --- a/kicker/applets/launcher/flowgridmanager.cpp +++ b/kicker/applets/launcher/flowgridmanager.cpp @@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size,                                   TQSize p_space_size,                                   TQSize p_border_size,                                   TQSize p_frame_size, -                                 Qt::Orientation orient, +                                 TQt::Orientation orient,                                   int num_items,                                   Slack slack_x,Slack slack_y)  { @@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size)          return;      _pFrameSize=p_frame_size;      if (_pFrameSize.width()<=0) { -        _orientation=Qt::Vertical; +        _orientation=TQt::Vertical;      }      if (_pFrameSize.height()<=0) { -        _orientation=Qt::Horizontal; +        _orientation=TQt::Horizontal;      }      _dirty=true;  } -void FlowGridManager::setOrientation(Qt::Orientation orient) +void FlowGridManager::setOrientation(TQt::Orientation orient)  {   if (orient==_orientation)          return;      _orientation=orient; _dirty=true; @@ -114,7 +114,7 @@ TQSize  FlowGridManager::frameSize() const  TQPoint FlowGridManager::origin() const  {   _checkReconfigure();  return _origin;} -Qt::Orientation FlowGridManager::orientation() const +TQt::Orientation FlowGridManager::orientation() const  {   _checkReconfigure();  return _orientation;}  /*Slack FlowGridManager::slackX() const @@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const  // return height if orientation is Horizontal  // return width if orientation is Vertical  int FlowGridManager::_getHH(TQSize size) const -{  if (_orientation==Qt::Horizontal) +{  if (_orientation==TQt::Horizontal)          return size.height();      return size.width();  } @@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const  // return height if orientation is Vertical  // return width if orientation is Horizontal  int FlowGridManager::_getWH(TQSize size) const -{  if (_orientation==Qt::Horizontal) +{  if (_orientation==TQt::Horizontal)          return size.width();      return size.height();  }  // swap horizontal and vertical if orientation is Vertical, otherwise return arg  TQSize FlowGridManager::_swapHV(TQSize hv) const -{  if (_orientation==Qt::Horizontal) +{  if (_orientation==TQt::Horizontal)          return hv;      TQSize temp=hv;      temp.transpose(); diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h index c801431b4..228210884 100644 --- a/kicker/applets/launcher/flowgridmanager.h +++ b/kicker/applets/launcher/flowgridmanager.h @@ -26,7 +26,7 @@ public:                                       TQSize p_space_size=TQSize(0,0),                                       TQSize p_border_size=TQSize(0,0),                                       TQSize frame_size=TQSize(0,0), -                                     Qt::Orientation orient=Qt::Horizontal, +                                     TQt::Orientation orient=TQt::Horizontal,                                       int num_items=0,                                       Slack slack_x=ItemSlack,                                       Slack slack_y=ItemSlack); @@ -36,7 +36,7 @@ public:      void setItemSize(TQSize item_size);      void setSpaceSize(TQSize space_size);      void setBorderSize(TQSize border_size); -    void setOrientation(Qt::Orientation orient); +    void setOrientation(TQt::Orientation orient);      void setFrameSize(TQSize frame_size);      void setSlack(Slack slack_x, Slack slack_y);      void setConserveSpace(bool conserve); @@ -49,7 +49,7 @@ public:      TQSize  gridSpacing() const;      TQSize  frameSize() const;      TQPoint origin() const; -    Qt::Orientation orientation() const; +    TQt::Orientation orientation() const;      bool   conserveSpace() const;  //    Slack  slackX() const; @@ -76,7 +76,7 @@ protected:      TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;      Slack _slackX, _slackY;      bool _conserveSpace; -    Qt::Orientation _orientation; +    TQt::Orientation _orientation;      int _numItems;      // results diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index cdbc94dd5..40957c44f 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -23,8 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  ******************************************************************/ -#include <kstandarddirs.h> -#include <kdesktopfile.h> +#include <tdestandarddirs.h> +#include <tdedesktopfile.h>  #include <tdeglobalsettings.h>  #include <tdesycocaentry.h>  #include <kservice.h> @@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat  {     _targetObject = target;     _sender = sender; -   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)),  -           target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); +   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)),  +           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));  }  QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name) @@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS  {     _targetObject = target;     _sender = sender; -   connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), -           target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); +   connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), +           target, TQ_SLOT(addAppBeforeManually(TQString,TQString)));  }  void QuickAddAppsMenu::slotExec(int id) diff --git a/kicker/applets/launcher/quickaddappsmenu.h b/kicker/applets/launcher/quickaddappsmenu.h index 01c185181..b5bab8bfc 100644 --- a/kicker/applets/launcher/quickaddappsmenu.h +++ b/kicker/applets/launcher/quickaddappsmenu.h @@ -29,7 +29,7 @@ s  #include "service_mnu.h"  class QuickAddAppsMenu: public PanelServiceMenu { -   Q_OBJECT +   TQ_OBJECT  public:     QuickAddAppsMenu(const TQString &label, const TQString &relPath, TQWidget *target, TQWidget *parent=0, const char *name=0, const TQString &sender=TQString(""));     QuickAddAppsMenu(TQWidget *target, TQWidget *parent=0, const TQString &sender=TQString(""), const char *name=0); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 19377c1b4..e7226c8a4 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include <tdeactionclasses.h>  #include <kickertip.h>  #include <tdelocale.h> -#include <kdesktopfile.h> +#include <tdedesktopfile.h>  #include <krun.h>  #include <kiconeffect.h>  #include <tdeglobalsettings.h> @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include <kipc.h>  #include <kiconloader.h>  #include <kurldrag.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h>  #include <math.h>  #include <algorithm> @@ -118,7 +118,7 @@ QuickURL::QuickURL(const TQString &u)  }  void QuickURL::run() const -{  kapp->propagateSessionManager();   // is this needed? +{  tdeApp->propagateSessionManager();   // is this needed?     if (_service)        KRun::run(*(_service), KURL::List());     else @@ -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;  } @@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,      if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {          setToggleButton(true);          setOn( ShowDesktop::the()->desktopShowing() ); -        connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); +        connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) );      }      TQToolTip::add(this, _qurl->name()); @@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction,      configAction->plug(_popup);          _popup->insertSeparator();      _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"),  -            this, TQT_SLOT(removeApp())); +            this, TQ_SLOT(removeApp()));      m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), -        TDEShortcut(), TQT_TQOBJECT(this)); -    connect(m_stickyAction, TQT_SIGNAL(toggled(bool)),  -        this, TQT_SLOT(slotStickyToggled(bool))); +        TDEShortcut(), this); +    connect(m_stickyAction, TQ_SIGNAL(toggled(bool)),  +        this, TQ_SLOT(slotStickyToggled(bool)));      m_stickyAction->plug(_popup, 2);      m_stickyId = _popup->idAt(2); -    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch())); -    connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent, -        TQT_SLOT(removeAppManually(QuickButton *))); +    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch())); +    connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent, +        TQ_SLOT(removeAppManually(QuickButton *)));  }  QuickButton::~QuickButton() @@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)  void QuickButton::mousePressEvent(TQMouseEvent *e)  { -   if (e->button() == Qt::RightButton) +   if (e->button() == TQt::RightButton)        _popup->popup(e->globalPos()); -   else if (e->button() == Qt::LeftButton) { +   else if (e->button() == TQt::LeftButton) {        _dragPos = e->pos();        TQButton::mousePressEvent(e);     } @@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)  void QuickButton::mouseMoveEvent(TQMouseEvent *e)  { -   if ((e->state() & Qt::LeftButton) == 0) return; +   if ((e->state() & TQt::LeftButton) == 0) return;     TQPoint p(e->pos() - _dragPos);     if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())        return; @@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)         dd->drag();         releaseKeyboard();     } else { -       setCursor(Qt::ForbiddenCursor); +       setCursor(TQt::ForbiddenCursor);     }  } @@ -266,10 +266,10 @@ void QuickButton::launch()     }     if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {         if (isOn()) { -           ShowDesktop::the()->showDesktop(TRUE); +           ShowDesktop::the()->showDesktop(true);         }         else { -           ShowDesktop::the()->showDesktop(FALSE); +           ShowDesktop::the()->showDesktop(false);         }     }     else { @@ -303,7 +303,7 @@ void QuickButton::removeApp()  void QuickButton::flash()  {     m_flashCounter = 2000; -   TQTimer::singleShot(0, this, TQT_SLOT(slotFlash())); +   TQTimer::singleShot(0, this, TQ_SLOT(slotFlash()));  }  void QuickButton::slotFlash() @@ -314,7 +314,7 @@ void QuickButton::slotFlash()          m_flashCounter -= timeout;          if (m_flashCounter < 0) m_flashCounter = 0;          update(); -        TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash())); +        TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash()));      }  } diff --git a/kicker/applets/launcher/quickbutton.h b/kicker/applets/launcher/quickbutton.h index ea5ed21aa..ebb967def 100644 --- a/kicker/applets/launcher/quickbutton.h +++ b/kicker/applets/launcher/quickbutton.h @@ -66,7 +66,7 @@ private:  class QuickButton: public SimpleButton, public KickerTip::Client { -    Q_OBJECT +    TQ_OBJECT  public:      enum { DEFAULT_ICON_DIM = 16 }; diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 1c153d85c..d45480542 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -28,7 +28,7 @@ public:  };  QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) -{   return findProperty(desc, std::mem_fun(&QuickButton::url));} +{   return findProperty(desc, std::mem_fn(&QuickButton::url));}  inline void QuickButtonGroup::setUpdatesEnabled(bool enable)  {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) { @@ -38,16 +38,16 @@ inline void QuickButtonGroup::setUpdatesEnabled(bool enable)  }  inline void QuickButtonGroup::show() -{   std::for_each(begin(),end(),std::mem_fun(&TQWidget::show));} +{   std::for_each(begin(),end(),std::mem_fn(&TQWidget::show));}  inline void QuickButtonGroup::hide() -{   std::for_each(begin(),end(),std::mem_fun(&TQWidget::hide));} +{   std::for_each(begin(),end(),std::mem_fn(&TQWidget::hide));}  inline void QuickButtonGroup::setDragging(bool drag) -{   std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setDragging),drag));} +{   std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setDragging),std::placeholders::_1,drag));}  inline void QuickButtonGroup::setEnableDrag(bool enable) -{   std::for_each(begin(),end(),std::bind2nd(std::mem_fun(&QuickButton::setEnableDrag),enable));} +{   std::for_each(begin(),end(),std::bind(std::mem_fn(&QuickButton::setEnableDrag),std::placeholders::_1,enable));}  inline void QuickButtonGroup::deleteContents()  {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) { diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 1ee251b36..3f703348f 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  #include <tdemessagebox.h>  #include <knuminput.h>  #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h>  #include <kurldrag.h>  #include <kdebug.h> @@ -69,7 +69,7 @@ const ButtonGroup::Index Append=ButtonGroup::Append;  extern "C"  { -    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) +    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)      {          TDEGlobal::locale()->insertCatalogue("quicklauncher");          return new QuickLauncher(configFile, KPanelApplet::Normal, @@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions,      m_dragButtons = 0;      m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(), -        TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); +        this, TQ_SLOT(slotConfigure()), this);      m_saveTimer = new TQTimer(this, "m_saveTimer"); -    connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); +    connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig()));      m_popularity = new PopularityStatistics(); @@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu()      m_appletPopup = new TQPopupMenu(this);      m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu);      m_removeAppsMenu = new TQPopupMenu(this); -    connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()), -            TQT_SLOT(fillRemoveAppsMenu())); -    connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)),  -            TQT_SLOT(removeAppManually(int))); +    connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()), +            TQ_SLOT(fillRemoveAppsMenu())); +    connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)),  +            TQ_SLOT(removeAppManually(int)));      m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu);      m_appletPopup->insertSeparator();      m_appletPopup->setCheckable( true ); -    m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about())); +    m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about()));      setCustomMenu(m_appletPopup);  } @@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure()          m_configDialog = new ConfigDlg(this, "configdialog",               m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok |               KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default); -        connect(m_configDialog, TQT_SIGNAL(settingsChanged()), -            this, TQT_SLOT(slotSettingsDialogChanged())); +        connect(m_configDialog, TQ_SIGNAL(settingsChanged()), +            this, TQ_SLOT(slotSettingsDialogChanged()));      }      m_configDialog->show(); @@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const  {      FlowGridManager temp_manager = *m_manager;      temp_manager.setFrameSize(TQSize(h,h)); -    temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary +    temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary      if (temp_manager.isValid())      {          return temp_manager.frameSize().width(); @@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const  {      FlowGridManager temp_manager=*m_manager;      temp_manager.setFrameSize(TQSize(w,w)); -    temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary +    temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary      if (temp_manager.isValid())      {          return temp_manager.frameSize().height(); @@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const  int QuickLauncher::dimension() const  { -    if (orientation()==Qt::Vertical) +    if (orientation()==TQt::Vertical)      {          return size().width();      } @@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded)  QuickButton* QuickLauncher::createButton(TQString url)  {      QuickButton* newButton=new QuickButton(url, m_configAction, this); -    connect(newButton, TQT_SIGNAL(executed(TQString)),  -            this, TQT_SLOT(slotOwnServiceExecuted(TQString))); -    connect(newButton, TQT_SIGNAL(stickyToggled(bool)),  -            this, TQT_SLOT(slotStickyToggled())); +    connect(newButton, TQ_SIGNAL(executed(TQString)),  +            this, TQ_SLOT(slotOwnServiceExecuted(TQString))); +    connect(newButton, TQ_SIGNAL(stickyToggled(bool)),  +            this, TQ_SLOT(slotStickyToggled()));      newButton->setPopupDirection(popupDirection());      return newButton;  } @@ -507,7 +507,7 @@ void QuickLauncher::about()  void QuickLauncher::mousePressEvent(TQMouseEvent *e)  { -    if (e->button() == Qt::RightButton) +    if (e->button() == TQt::RightButton)      {          m_popup->popup(e->globalPos());      } @@ -856,7 +856,7 @@ void QuickLauncher::loadConfig()      int n = 0;      while (iter != urls.end()) {          TQString url = *iter; -        addApp(url, n, false); +        if(!url.isEmpty()) addApp(url, n, false);          ++iter;          ++n;      } @@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto      if (m_settings->autoAdjustEnabled())      { -        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); +        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));      }  } @@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId)      m_popularity->useService(serviceMenuId);      if (m_settings->autoAdjustEnabled())      { -        TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); +        TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity()));      }  } @@ -1077,7 +1077,7 @@ void QuickLauncher::updateStickyHighlightLayer()      m_stickyHighlightLayer = TQImage(width(), height(), 32);      m_stickyHighlightLayer.setAlphaBuffer(true);      int pix, tlPix, brPix, w(width()), h(height()); -    QRgb transparent(tqRgba(0, 0, 0, 0)); +    TQRgb transparent(tqRgba(0, 0, 0, 0));      for (int y = h-1; y >= 0; --y)      {          for (int x = w-1; x >= 0; --x) diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h index 2c47b602a..b6211f054 100644 --- a/kicker/applets/launcher/quicklauncher.h +++ b/kicker/applets/launcher/quicklauncher.h @@ -45,7 +45,7 @@ typedef QuickButtonGroup ButtonGroup;  class QuickLauncher: public KPanelApplet, public DCOPObject  { -    Q_OBJECT +    TQ_OBJECT      K_DCOP  k_dcop:  | 
