diff options
Diffstat (limited to 'kicker/applets/launcher')
-rw-r--r-- | kicker/applets/launcher/configdlgbase.ui | 38 | ||||
-rw-r--r-- | kicker/applets/launcher/quickaddappsmenu.cpp | 2 | ||||
-rw-r--r-- | kicker/applets/launcher/quickbutton.cpp | 14 | ||||
-rw-r--r-- | kicker/applets/launcher/quicklauncher.cpp | 18 |
4 files changed, 36 insertions, 36 deletions
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index bfb1bc4e6..49916ebeb 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDlgBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDlgBase</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_DragEnabled</cstring> </property> @@ -27,7 +27,7 @@ <string>Allow drag and drop</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -38,7 +38,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_ConserveSpace</cstring> </property> @@ -49,7 +49,7 @@ <string>Do not expand icons to the size of the panel</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -57,7 +57,7 @@ <string>Icon size:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>iconDim</cstring> </property> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>332</width> <height>20</height> @@ -84,7 +84,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>autoAdjustGroup</cstring> </property> @@ -95,7 +95,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>layout1</cstring> </property> @@ -103,7 +103,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_HistoryHorizon</cstring> </property> @@ -130,38 +130,38 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>140</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> <property name="text"> <string>Short Term</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>Long Term</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> @@ -196,7 +196,7 @@ <cstring>kcfg_AutoAdjustMaxItems</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -204,7 +204,7 @@ <string>Minimum number of applications:</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>kcfg_AutoAdjustEnabled</cstring> </property> diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 0eebec315..7dcb16098 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -53,7 +53,7 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS void QuickAddAppsMenu::slotExec(int id) { - if (!entryMap_.contains(id)) return; + if (!entryMap_.tqcontains(id)) return; KSycocaEntry * e = entryMap_[id]; KService::Ptr service = static_cast<KService *>(e); emit addAppBefore(locate("apps", service->desktopEntryPath()),_sender); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 2ac0742ca..6e68e2ce1 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -67,7 +67,7 @@ QuickURL::QuickURL(const TQString &u) if (_menuId.endsWith(".desktop")) { // Strip path TQString s = _menuId; - s = s.mid(s.findRev('/')+1); + s = s.mid(s.tqfindRev('/')+1); s = s.left(s.length()-8); _service = KService::serviceByStorageId(s); if (!_service) { @@ -121,7 +121,7 @@ TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group, { // Load icon TQPixmap pxmap = KMimeType::pixmapForURL(_kurl, _mode, _group, _force_size, _state); // Resize to fit button - pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQImage::ScaleMin)); + pxmap.convertFromImage(pxmap.convertToImage().smoothScale(_force_size,_force_size, TQ_ScaleMin)); return pxmap; } @@ -140,7 +140,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); @@ -152,7 +152,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, this, TQT_SLOT(removeApp())); m_stickyAction = new KToggleAction(i18n("Never Remove Automatically"), - KShortcut(), this); + KShortcut(), TQT_TQOBJECT(this)); connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); @@ -197,9 +197,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e) void QuickButton::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) _popup->popup(e->globalPos()); - else if (e->button() == LeftButton) { + else if (e->button() == Qt::LeftButton) { _dragPos = e->pos(); TQButton::mousePressEvent(e); } @@ -207,7 +207,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e) void QuickButton::mouseMoveEvent(TQMouseEvent *e) { - if ((e->state() & LeftButton) == 0) return; + if ((e->state() & Qt::LeftButton) == 0) return; TQPoint p(e->pos() - _dragPos); if (p.manhattanLength() <= KGlobalSettings::dndEventDelay()) return; diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index a278b39c9..9c1228a2d 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -108,7 +108,7 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new KAction(i18n("Configure Quicklauncher..."), "configure", KShortcut(), - this, TQT_SLOT(slotConfigure()), this); + TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); m_saveTimer = new TQTimer(this, "m_saveTimer"); connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); @@ -503,7 +503,7 @@ void QuickLauncher::about() void QuickLauncher::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) { m_popup->popup(e->globalPos()); } @@ -828,7 +828,7 @@ void QuickLauncher::loadConfig() for (n=0; n<int(m_buttons->size()); ++n) { QuickButton* button = (*m_buttons)[n]; - if (volatileButtons.contains(button->menuId()) == false) + if (volatileButtons.tqcontains(button->menuId()) == false) { button->setSticky(true); } @@ -1040,19 +1040,19 @@ void QuickLauncher::updateStickyHighlightLayer() m_stickyHighlightLayer = TQImage(width(), height(), 32); m_stickyHighlightLayer.setAlphaBuffer(true); int pix, tlPix, brPix, w(width()), h(height()); - QRgb transparent(qRgba(0, 0, 0, 0)); + QRgb transparent(tqRgba(0, 0, 0, 0)); for (int y = h-1; y >= 0; --y) { for (int x = w-1; x >= 0; --x) { - pix = qRed(areaLayer.pixel(x, y)); + pix = tqRed(areaLayer.pixel(x, y)); if (pix == 0) { - tlPix = (y>0 && x>0) ? qRed(areaLayer.pixel(x-1,y-1)) : 255; - brPix = (y<h-1 && x<w-1) ? qRed(areaLayer.pixel(x+1,y+1)) : 255; + tlPix = (y>0 && x>0) ? tqRed(areaLayer.pixel(x-1,y-1)) : 255; + brPix = (y<h-1 && x<w-1) ? tqRed(areaLayer.pixel(x+1,y+1)) : 255; int c = tlPix-brPix < 0 ? 255 : 0; int alpha = abs(tlPix-brPix)/2; - m_stickyHighlightLayer.setPixel(x, y, qRgba(c, c, c, alpha)); + m_stickyHighlightLayer.setPixel(x, y, tqRgba(c, c, c, alpha)); } else { @@ -1060,7 +1060,7 @@ void QuickLauncher::updateStickyHighlightLayer() } } } - repaint(); + tqrepaint(); } void QuickLauncher::paintEvent(TQPaintEvent* e) |