From 0e5ef873f0394ebc87c08d030130cf4089cb1d42 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 22 Dec 2023 18:45:07 +0900 Subject: Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro (cherry picked from commit c4a6487c827add9382001ff1892b8fb3bfa94682) --- kicker/applets/clock/clock.cpp | 20 ++++++++-------- kicker/applets/launcher/quickbutton.cpp | 2 +- kicker/applets/launcher/quicklauncher.cpp | 2 +- kicker/applets/media/mediumbutton.cpp | 6 ++--- kicker/applets/minipager/pagerapplet.cpp | 4 ++-- kicker/applets/naughty/NaughtyApplet.cpp | 2 +- kicker/applets/systemtray/systemtrayapplet.cpp | 2 +- kicker/applets/trash/trashbutton.cpp | 4 ++-- kicker/extensions/dockbar/dockbarextension.cpp | 2 +- kicker/extensions/kasbar/kastasker.cpp | 32 +++++++++++++------------- kicker/extensions/kasbar/kastaskitem.cpp | 2 +- kicker/extensions/sidebar/sidebarextension.cpp | 2 +- kicker/kicker/core/container_applet.cpp | 6 ++--- kicker/kicker/core/container_button.cpp | 2 +- kicker/kicker/core/container_extension.cpp | 4 ++-- kicker/kicker/core/kicker.cpp | 2 +- kicker/kicker/core/kickerbindings.cpp | 2 +- kicker/kicker/core/pluginmanager.cpp | 6 ++--- kicker/kicker/ui/addapplet.cpp | 2 +- kicker/kicker/ui/k_mnu.cpp | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 12 +++++----- kicker/kicker/ui/service_mnu.cpp | 4 ++-- kicker/libkicker/kickertip.cpp | 4 ++-- kicker/libkicker/menuinfo.cpp | 2 +- kicker/menuext/kate/katesessionmenu.cpp | 2 +- kicker/taskbar/taskbar.cpp | 2 +- kicker/taskbar/taskbarbindings.cpp | 2 +- kicker/taskmanager/taskmanager.cpp | 2 +- 28 files changed, 68 insertions(+), 68 deletions(-) (limited to 'kicker') diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 131ce7482..408349250 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); + connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); @@ -104,23 +104,23 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, settings->widgetStack->addWidget(fuzzyPage, 3); fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); - connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)), + connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(settings->kcfg_PlainShowDayOfWeek), TQT_SIGNAL(toggled(bool)), + connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), + connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDayOfWeek), TQT_SIGNAL(toggled(bool)), + connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(digitalPage->kcfg_DigitalShowDate), TQT_SIGNAL(toggled(bool)), + connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDate), TQT_SIGNAL(toggled(bool)), + connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(analogPage->kcfg_AnalogShowDayOfWeek), TQT_SIGNAL(toggled(bool)), + connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDate), TQT_SIGNAL(toggled(bool)), + connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), + connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 741eee46d..add317a3b 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -175,7 +175,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, this, TQT_SLOT(removeApp())); m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), - TDEShortcut(), TQT_TQOBJECT(this)); + TDEShortcut(), this); connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 624c229da..d0f5d25dd 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 TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), TQT_TQOBJECT(this)); + this, TQT_SLOT(slotConfigure()), this); m_saveTimer = new TQTimer(this, "m_saveTimer"); connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index b87f73ab1..5977063d7 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -45,13 +45,13 @@ #include MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), mFileItem(fileItem), mOpenTimer(0, + : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 7685f04d7..be61ad451 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( TDEGlobalSettings::taskbarFont() ); - m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_twin = new KWinModule(this); m_activeWindow = m_twin->activeWindow(); m_curDesk = m_twin->currentDesktop(); @@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) { // must own manager selection before setting global desktop layout int screen = DefaultScreen( tqt_xdisplay()); m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), - screen, TQT_TQOBJECT(this) ); + screen, this ); if( !m_desktopLayoutOwner->claim( false )) { delete m_desktopLayoutOwner; diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 8eb26afbc..2e75890d6 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -71,7 +71,7 @@ NaughtyApplet::NaughtyApplet TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); - monitor_ = new NaughtyProcessMonitor(2, 20, TQT_TQOBJECT(this)); + monitor_ = new NaughtyProcessMonitor(2, 20, this); connect ( diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 2985e1915..917382d8b 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -104,7 +104,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac setBackgroundOrigin(AncestorOrigin); - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); // kApplication notifies us of settings changes. added to support // disabling of frame effect on mouse hover diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 85c0eef62..3205f6910 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -32,14 +32,14 @@ #include TrashButton::TrashButton(TQWidget *parent) - : PanelPopupButton(parent), mActions(TQT_TQWIDGET(this), TQT_TQOBJECT(this)), + : PanelPopupButton(parent), mActions(this, this), mFileItem(KFileItem::Unknown, KFileItem::Unknown, "trash:/") { TDEIO::UDSEntry entry; TDEIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - TDEAction *a = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index cbd336f6f..143812e0d 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -57,7 +57,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - twin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(this); connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 11185c9e0..04d6a8e0f 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -152,57 +152,57 @@ TDEPopupMenu *KasTasker::contextMenu() menu = new TDEPopupMenu; showAllWindowsAction = new TDEToggleAction( i18n("Show &All Windows"), TDEShortcut(), - TQT_TQOBJECT(this), "toggle_show_all_windows" ); + this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(), - TQT_TQOBJECT(this), "toggle_group_windows" ); + this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); - showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_clock" ); + showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); - showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_show_load" ); + showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); menu->insertSeparator(); if ( !standalone_ ) { - toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), TQT_TQOBJECT(this), "toggle_detached" ); + toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); } rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( toggleOrientation() ), - TQT_TQOBJECT(this), "rotate_bar" ); + this, TQT_SLOT( toggleOrientation() ), + this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( TQT_TQOBJECT(this), TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); + connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), TQT_TQOBJECT(this), TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); // Help menu TDEPopupMenu *help = new TDEPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), TQT_TQOBJECT(this), TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 0f57524cc..ee4a0bc7d 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -390,7 +390,7 @@ void KasTaskItem::showPropertiesDialog() tabs->addTab( createTaskProps( task_, tabs ), i18n("Task") ); tabs->addTab( createTaskProps( this, tabs ), i18n("Item") ); - tabs->addTab( createTaskProps( TQT_TQOBJECT(kasbar()), tabs, false ), i18n("Bar") ); + tabs->addTab( createTaskProps( kasbar(), tabs, false ), i18n("Bar") ); #if 0 tabs->addTab( createNETProps( tabs ), i18n("NET") ); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 89b0c4028..d29299939 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -57,7 +57,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile, "konq_sidebar", m_sbWrapper, "SideBar_View", - TQT_TQOBJECT(this), + this, "Sidebar","universal"); KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 81f2139c5..e72dd1887 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -92,7 +92,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _layout->addWidget(TQT_TQWIDGET(_handle), 0); + _layout->addWidget(_handle, 0); connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), this, TQT_SLOT(moveApplet(const TQPoint&))); connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); @@ -225,7 +225,7 @@ void AppletContainer::showAppletMenu() Kicker::the()->setInsertionPoint(_handle->mapToGlobal(_handle->rect().center())); - switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(_handle)))) + switch(menu->exec(KickerLib::popupPosition(popupDirection(), menu, _handle))) { case PanelAppletOpMenu::Move: moveApplet(_handle->mapToParent(_handle->rect().center())); @@ -471,7 +471,7 @@ void AppletContainer::setImmutable(bool immutable) } else if (!_handle->isVisibleTo(this)) { - TQToolTip::add(TQT_TQWIDGET(_handle), _info.name()); + TQToolTip::add(_handle, _info.name()); _handle->show(); setBackground(); } diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index da1a5e4c2..3c53d211e 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -262,7 +262,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) TQPopupMenu* menu = opMenu(); connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); - TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this), + TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, (orientation() == TQt::Horizontal) ? TQPoint(0, 0) : me->pos()); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index dff2836e9..9553e0a85 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -149,7 +149,7 @@ void ExtensionContainer::init() connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); - _popupWidgetFilter = new PopupWidgetFilter( TQT_TQOBJECT(this) ); + _popupWidgetFilter = new PopupWidgetFilter( this ); connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); // layout @@ -733,7 +733,7 @@ void ExtensionContainer::autoHideTimeout() { // kdDebug(1210) << "PanelContainer::autoHideTimeout() " << name() << endl; // Hack: If there is a popup open, don't autohide until it closes. - TQWidget* popup = TQT_TQWIDGET(TQApplication::activePopupWidget()); + TQWidget* popup = TQApplication::activePopupWidget(); if (popup) { diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 94517607e..6a92b3899 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -116,7 +116,7 @@ Kicker::Kicker() // initialize our keys // note that this creates the KMenu by calling MenuManager::the() - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( this ); #define KICKER_ALL_BINDINGS #include "kickerbindings.cpp" keys->readSettings(); diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index b8d774fdb..07ac99d7a 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(target), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, target, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index a8b79877a..a0c1c0c31 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -159,7 +159,7 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { - _dict.insert( TQT_TQOBJECT(applet), new AppletInfo( info ) ); + _dict.insert( applet, new AppletInfo( info ) ); connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -197,7 +197,7 @@ KPanelExtension* PluginManager::loadExtension( KPanelExtension* extension = init_ptr( parent, info.configFile() ); if( extension ) { - _dict.insert( TQT_TQOBJECT(extension), new AppletInfo( info ) ); + _dict.insert( extension, new AppletInfo( info ) ); connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); } @@ -365,7 +365,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) void LibUnloader::unload( const TQString &libName ) { - (void)new LibUnloader( libName, TQT_TQOBJECT(kapp) ); + (void)new LibUnloader( libName, kapp ); } void LibUnloader::unload() diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 26cddaf7b..27d709837 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -305,7 +305,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) if (e->type() == TQEvent::Resize) TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); - return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e); + return this->TQObject::eventFilter(o, e); } void AddAppletDialog::populateApplets() diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 79ba8826f..2fe75f2d5 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -528,7 +528,7 @@ void PanelKMenu::slotSessionActivated( int ent ) void PanelKMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), i18n("

You have chosen to open another desktop session.
" "The current session will be hidden " "and a new login screen will be displayed.
" diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index ad443995f..01eed897f 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->parentWidget(true)); + receiver = static_cast(receiver)->parentWidget(true); else break; } @@ -533,7 +533,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) TQWidget::StrongFocus : TQWidget::NoFocus); setTabOrder(raiseWidget, m_searchResultsWidget); if (raiseWidget != m_stacker->visibleWidget() - && TQT_TQWIDGET(receiver)->focusPolicy() == TQWidget::NoFocus + && static_cast(receiver)->focusPolicy() == TQWidget::NoFocus && m_stacker->id(raiseWidget) >= 0) { m_stacker->raiseWidget(raiseWidget); @@ -562,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) } if(e->type() == TQEvent::Enter && receiver->isWidgetType()) { - TQT_TQWIDGET(receiver)->setMouseTracking(true); + static_cast(receiver)->setMouseTracking(true); TQToolTip::hide(); } @@ -1445,7 +1445,7 @@ void KMenu::insertStaticItems() m_systemView->insertItem( "network", i18n( "Network Folders" ), "remote:/", "remote:/", nId++, index++ ); - m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) ); + m_mediaWatcher = new MediaWatcher( this ); connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); m_media_id = 0; @@ -1534,7 +1534,7 @@ void KMenu::slotSessionActivated( int ent ) void KMenu::doNewSession( bool lock ) { int result = KMessageBox::warningContinueCancel( - TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))), + kapp->desktop()->screen(kapp->desktop()->screenNumber(this)), i18n("

You have chosen to open another desktop session.
" "The current session will be hidden " "and a new login screen will be displayed.
" @@ -2979,7 +2979,7 @@ void KMenu::slotContextMenu(int selected) case EditItem: case EditMenu: accept(); - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 10510ca6f..0e8a8ce99 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -696,7 +696,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditItem: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast(contextKSycocaEntry_)->menuId(); proc->start(); @@ -740,7 +740,7 @@ void PanelServiceMenu::slotContextMenu(int selected) } case EditMenu: - proc = new TDEProcess(TQT_TQOBJECT(this)); + proc = new TDEProcess(this); *proc << TDEStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast(contextKSycocaEntry_)->relPath(); proc->start(); diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index b3716a871..a491aae27 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -452,7 +452,7 @@ void KickerTip::tipperDestroyed(TQObject* o) { // we can't do a dynamic cast because we are in the process of dying // so static it is. - untipFor(TQT_TQWIDGET(o)); + untipFor(static_cast(o)); } void KickerTip::internalUpdate() @@ -508,7 +508,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) return false; } - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast(object); switch (event->type()) { diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index a8e4bf1fa..8cdc4c664 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -64,5 +64,5 @@ KPanelMenu* MenuInfo::load(TQWidget *parent, const char *name) return KParts::ComponentFactory::createInstanceFromLibrary( TQFile::encodeName( library_ ), - TQT_TQOBJECT(parent), name ); + parent, name ); } diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index c992cf855..4238fc562 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -136,7 +136,7 @@ void KateSessionMenu::slotExec( int id ) TQString name = KInputDialog::getText( i18n("Session Name"), i18n("Please enter a name for the new session"), TQString::null, - &ok, 0, 0, new Validator( TQT_TQOBJECT(m_parent) ) ); + &ok, 0, 0, new Validator( m_parent ) ); if ( ! ok ) return; diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 9ca123a94..81f54f25b 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -132,7 +132,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin blocklayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - keys = new TDEGlobalAccel( TQT_TQOBJECT(this) ); + keys = new TDEGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); keys->updateConnections(); diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index 364faac97..c451d621f 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 33df1ddd6..d4da190b6 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -1305,7 +1305,7 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = TQT_TQWIDGET(tqApp->desktop()); + TQWidget *rootWin = tqApp->desktop(); TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), -- cgit v1.2.1