summaryrefslogtreecommitdiffstats
path: root/kicker/applets/launcher
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/applets/launcher')
-rw-r--r--kicker/applets/launcher/configdlg.cpp4
-rw-r--r--kicker/applets/launcher/quickaddappsmenu.cpp12
-rw-r--r--kicker/applets/launcher/quickbutton.cpp28
-rw-r--r--kicker/applets/launcher/quickbuttongroup.h10
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp34
5 files changed, 44 insertions, 44 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/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/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index add317a3b..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
@@ -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(), this);
- connect(m_stickyAction, TQT_SIGNAL(toggled(bool)),
- this, TQT_SLOT(slotStickyToggled(bool)));
+ 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()
@@ -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/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 d0f5d25dd..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(),
- this, TQT_SLOT(slotConfigure()), 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();
@@ -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;
}
@@ -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()));
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-18 03:27:00 +0000