diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-22 18:45:07 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-12-26 21:26:32 +0900 |
commit | c4a6487c827add9382001ff1892b8fb3bfa94682 (patch) | |
tree | ec6c8a691a15099df946531b66355a76ca02b2db /kcontrol | |
parent | 7c724a49212a9ffdf42381d99648f15457867787 (diff) | |
download | tdebase-c4a6487c827add9382001ff1892b8fb3bfa94682.tar.gz tdebase-c4a6487c827add9382001ff1892b8fb3bfa94682.zip |
Replace various '#define' strings - part 6
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kcontrol')
-rw-r--r-- | kcontrol/background/bgdialog.cpp | 2 | ||||
-rw-r--r-- | kcontrol/clock/dtime.h | 2 | ||||
-rw-r--r-- | kcontrol/displayconfig/displayconfig.cpp | 28 | ||||
-rw-r--r-- | kcontrol/dnssd/kcmdnssd.cpp | 2 | ||||
-rw-r--r-- | kcontrol/hwmanager/hwdevicetray.cpp | 2 | ||||
-rw-r--r-- | kcontrol/hwmanager/hwdevicetray_bindings.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kcontrol/main.cpp | 4 | ||||
-rw-r--r-- | kcontrol/kcontrol/moduleIface.cpp | 2 | ||||
-rw-r--r-- | kcontrol/kcontrol/toplevel.cpp | 16 | ||||
-rw-r--r-- | kcontrol/locale/localemon.cpp | 4 | ||||
-rw-r--r-- | kcontrol/randr/tderandrbindings.cpp | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrpassivepopup.cpp | 2 | ||||
-rw-r--r-- | kcontrol/randr/tderandrtray.cpp | 6 | ||||
-rw-r--r-- | kcontrol/style/kcmstyle.cpp | 2 | ||||
-rw-r--r-- | kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp | 10 | ||||
-rw-r--r-- | kcontrol/tdefontinst/viewpart/FontViewerApp.cpp | 6 | ||||
-rw-r--r-- | kcontrol/tdeio/policydlg.cpp | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-appear.cpp | 2 | ||||
-rw-r--r-- | kcontrol/tdm/tdm-users.cpp | 2 |
19 files changed, 49 insertions, 49 deletions
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 89847c9b2..66acb0fce 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -73,7 +73,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_previewUpdates = true; KWinModule *m_twin; - m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_twin = new KWinModule(this); m_curDesk = m_twin->currentDesktop(); TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; diff --git a/kcontrol/clock/dtime.h b/kcontrol/clock/dtime.h index 387937185..ed8819502 100644 --- a/kcontrol/clock/dtime.h +++ b/kcontrol/clock/dtime.h @@ -118,7 +118,7 @@ class KStrictIntValidator : public TQIntValidator public: KStrictIntValidator(int bottom, int top, TQWidget * parent, const char * name = 0 ) - : TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {}; + : TQIntValidator(bottom, top, parent, name) {}; TQValidator::State validate( TQString & input, int & d ) const; }; diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 2c262fc3b..02a4d4e82 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -434,8 +434,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor->screen_id == monitor_id) { moved_monitor = monitor; screendata = m_screenInfoArray[activeProfileName].at(moved_monitor->screen_id); @@ -475,8 +475,8 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id, primary_monitor = NULL; if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor->screen_id == j) { monitor->is_primary = true; // Prevent dragging of the primary monitor primary_monitor = monitor; @@ -548,8 +548,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move) monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor != monitor_to_move) { other_monitors = other_monitors.unite(MonitorRegion(monitor->geometry())); } @@ -592,8 +592,8 @@ bool KDisplayConfig::applyMonitorLayoutRules(DraggableMonitor* monitor_to_move) monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor != monitor_to_move) { other_monitors2 = other_monitors2.unite(MonitorRegion(monitor->geometry())); } @@ -641,8 +641,8 @@ void KDisplayConfig::moveMonitor(DraggableMonitor* monitor, int realx, int realy primary_monitor = NULL; if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); if (monitor->screen_id == j) { monitor->is_primary = true; // Prevent dragging of the primary monitor primary_monitor = monitor; @@ -1329,8 +1329,8 @@ void KDisplayConfig::updateDragDropDisplay() { monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - TQWidget *monitor = TQT_TQWIDGET(monitors.at( i )); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + TQWidget *monitor = static_cast<TQWidget*>(monitors.at( i )); if ( !monitor->close(TRUE) ) { Q_ASSERT("zombie monitor will not go away!"); } @@ -1381,8 +1381,8 @@ void KDisplayConfig::layoutDragDropDisplay() { monitors = base->monitorPhyArrange->childrenListObject(); if ( monitors.count() ) { for ( i = 0; i < int(monitors.count()); ++i ) { - if (::tqt_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i )))) { - DraggableMonitor *monitor = static_cast<DraggableMonitor*>(TQT_TQWIDGET(monitors.at( i ))); + if (::tqt_cast<DraggableMonitor*>(monitors.at( i ))) { + DraggableMonitor *monitor = static_cast<DraggableMonitor*>(monitors.at( i )); screendata = m_screenInfoArray[activeProfileName].at(monitor->screen_id); moveMonitor(monitor, screendata->absolute_x_position, screendata->absolute_y_position); } diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index d442552e3..0ce36a463 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -119,7 +119,7 @@ void KCMDnssd::load() { if (geteuid()==0) loadMdnsd(); enableZeroconf->setChecked(false); - TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), TQT_TQOBJECT(this), "avahiStatus"); + TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); avahiStatus.start(); while (avahiStatus.isRunning()) { kapp->processEvents(); diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index 8aade89ca..4f4393e7e 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -158,7 +158,7 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name) connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitApp())); TQToolTip::add(this, i18n("Device monitor")); - globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(this); TDEGlobalAccel* keys = globalKeys; #include "hwdevicetray_bindings.cpp" // the keys need to be read from tdeglobals, not kickerrc diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp index bcbbbda1b..f8d8271bb 100644 --- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp +++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp @@ -18,7 +18,7 @@ */ #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/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 25ab4fc4a..a3912c5da 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -59,7 +59,7 @@ KControlApp::KControlApp() TDEGlobal::setActiveInstance(this); // KUniqueApplication does dcop regitration for us - ModuleIface *modIface = new ModuleIface(TQT_TQOBJECT(toplevel), "moduleIface"); + ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); @@ -90,7 +90,7 @@ KControlApp::~KControlApp() { TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); - TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); + TQWidget *desk = TQApplication::desktop(); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index dbaba9054..5cc43c82d 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -26,7 +26,7 @@ ModuleIface::ModuleIface(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject(name) { - _parent = TQT_TQWIDGET(parent); + _parent = static_cast<TQWidget*>(parent); } diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index c9a8a6763..bf7cc6f65 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -234,40 +234,40 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); icon_view = new TDERadioAction - (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()), + (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); tree_view = new TDERadioAction - (i18n("&Tree View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateTreeView()), + (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); icon_small = new TDERadioAction - (i18n("&Small"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateSmallIcons()), + (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); icon_medium = new TDERadioAction - (i18n("&Medium"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateMediumIcons()), + (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); icon_large = new TDERadioAction - (i18n("&Large"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateLargeIcons()), + (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); icon_huge = new TDERadioAction - (i18n("&Huge"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateHugeIcons()), + (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new TDEAction(i18n("About Current Module"), 0, TQT_TQOBJECT(this), TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); + about_module = new TDEAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); createGUI("kcontrolui.rc"); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 609e0c9ad..6d37cb15f 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -260,8 +260,8 @@ void TDELocaleConfigMoney::slotMonNegMonSignPosChanged(int i) void TDELocaleConfigMoney::slotTranslate() { TQObjectList list; - list.append(TQT_TQOBJECT(m_cmbMonPosMonSignPos)); - list.append(TQT_TQOBJECT(m_cmbMonNegMonSignPos)); + list.append(m_cmbMonPosMonSignPos); + list.append(m_cmbMonNegMonSignPos); TQComboBox *wc; for (TQObjectListIt li(list) ; (wc = (TQComboBox *)li.current()) != 0; ++li) diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index b95441f08..5df10af1f 100644 --- a/kcontrol/randr/tderandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -18,7 +18,7 @@ */ #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/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index 5d2010f94..c938a31fc 100644 --- a/kcontrol/randr/tderandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -94,7 +94,7 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.contains( TQT_TQWIDGET( o ))) + && watched_widgets.contains( static_cast<TQWidget*>( o ))) TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); return false; } diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 6a65662a7..6d44c3914 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -67,7 +67,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) my_parent = parent; //printf("Reading configuration...\n"); - globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(this); TDEGlobalAccel* keys = globalKeys; #include "tderandrbindings.cpp" // the keys need to be read from kdeglobals, not kickerrc @@ -314,7 +314,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration")); TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ), - SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotDisplayConfig() ), + SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotDisplayConfig() ), actionCollection() ); actColors->plug( menu ); @@ -324,7 +324,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) // actPrefs->plug( menu ); TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotSKeys() ), + SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotSKeys() ), actionCollection() ); actSKeys->plug( menu ); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index cc052e4c3..2a751f14e 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -851,7 +851,7 @@ void KCMStyle::styleChanged() void KCMStyle::switchStyle(const TQString& styleName, bool force) { // Don't flicker the preview if the same style is chosen in the cb - if (!force && appliedStyle && TQT_TQOBJECT(appliedStyle)->name() == styleName) + if (!force && appliedStyle && appliedStyle->name() == styleName) return; // Create an instance of the new style... diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index f81fba326..bb166bdc4 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), - itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -211,14 +211,14 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsListAct->plug(toolbar); } - itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, TQT_TQOBJECT(this), TQT_SLOT(filterFonts()), + itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQT_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, TQT_TQOBJECT(this), TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -232,11 +232,11 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) } toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Print..."), "document-print", 0, TQT_TQOBJECT(this), TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index df1fa92d2..ddb483e5e 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -49,10 +49,10 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); - itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); + itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL openURL; diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp index c45dd837e..385bc4a04 100644 --- a/kcontrol/tdeio/policydlg.cpp +++ b/kcontrol/tdeio/policydlg.cpp @@ -63,7 +63,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, m_dlgUI = new PolicyDlgUI (this); setMainWidget(m_dlgUI); - m_dlgUI->leDomain->setValidator(new DomainLineValidator(TQT_TQOBJECT(m_dlgUI->leDomain))); + m_dlgUI->leDomain->setValidator(new DomainLineValidator(m_dlgUI->leDomain)); m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 21745ef5d..5b8ede62e 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -146,7 +146,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) label = new TQLabel(i18n("Position:"), group); hglay->addMultiCellWidget(label, 0,1, 0,0, TQt::AlignVCenter); - TQValidator *posValidator = new TQIntValidator(0, 100, TQT_TQOBJECT(group)); + TQValidator *posValidator = new TQIntValidator(0, 100, group); TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group); hglay->addWidget(xLineLabel, 0, 1); xLineEdit = new TQLineEdit (group); diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index 4b7b64ba3..aeaeb9347 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -98,7 +98,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) " Note that users with the UID 0 (typically root) are not affected by this and must be" " explicitly hidden in \"Not hidden\" mode.")); TQSizePolicy sp_ign_fix( TQSizePolicy::Ignored, TQSizePolicy::Fixed ); - TQValidator *valid = new TQIntValidator( 0, 999999, TQT_TQOBJECT(minGroup) ); + TQValidator *valid = new TQIntValidator( 0, 999999, minGroup ); TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); |