diff options
Diffstat (limited to 'kcontrol/kcontrol')
25 files changed, 109 insertions, 114 deletions
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index c1ba4fecf..485f11442 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -84,8 +84,8 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca _viewer = new TDEHTMLPart( this, "_viewer" ); _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + this, TQ_SLOT(slotModuleLinkClicked(const KURL&)) ); updatePixmap(); } diff --git a/kcontrol/kcontrol/aboutwidget.h b/kcontrol/kcontrol/aboutwidget.h index 97ba32ffd..5d4543b39 100644 --- a/kcontrol/kcontrol/aboutwidget.h +++ b/kcontrol/kcontrol/aboutwidget.h @@ -33,7 +33,7 @@ class KURL; class AboutWidget : public TQHBox { - Q_OBJECT + TQ_OBJECT public: AboutWidget(TQWidget *parent, const char *name=0, TQListViewItem* category=0, const TQString &caption=TQString::null); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index dd1835e9d..67584a74d 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -105,7 +105,7 @@ ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) m_title = new ModuleTitle( titleLine, "m_title" ); TQPushButton *helpButton = new TQPushButton( titleLine ); helpButton->setIconSet( SmallIconSet("help") ); - connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) ); + connect (helpButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpRequest() ) ); m_body = new TQVBox( this, "m_body" ); setStretchFactor( m_body, 10 ); } @@ -137,7 +137,7 @@ DockContainer::DockContainer(TQWidget *parent) addWidget( _busyw ); _modulew = new ModuleWidget( this, "_modulew" ); - connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) ); + connect (_modulew, TQ_SIGNAL( helpRequest() ), TQ_SLOT( slotHelpRequest() ) ); addWidget( _modulew ); } @@ -163,17 +163,17 @@ void DockContainer::setBaseWidget(TQWidget *widget) ProxyWidget* DockContainer::loadModule( ConfigModule *module ) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); ProxyWidget *widget = _modulew->load( module ); if (widget) { _module = module; - connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule())); - connect(_module, TQT_SIGNAL(changed(ConfigModule *)), - TQT_SIGNAL(changedModule(ConfigModule *))); - connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged())); + connect(_module, TQ_SIGNAL(childClosed()), TQ_SLOT(removeModule())); + connect(_module, TQ_SIGNAL(changed(ConfigModule *)), + TQ_SIGNAL(changedModule(ConfigModule *))); + connect(widget, TQ_SIGNAL(quickHelpChanged()), TQ_SLOT(quickHelpChanged())); raiseWidget( _modulew ); emit newModule(widget->caption(), module->docPath(), widget->quickHelp()); diff --git a/kcontrol/kcontrol/dockcontainer.h b/kcontrol/kcontrol/dockcontainer.h index ea62495bd..7246691e6 100644 --- a/kcontrol/kcontrol/dockcontainer.h +++ b/kcontrol/kcontrol/dockcontainer.h @@ -30,7 +30,7 @@ class TQLabel; class ModuleWidget : public TQVBox { - Q_OBJECT + TQ_OBJECT public: ModuleWidget( TQWidget *parent, const char *name ); @@ -48,7 +48,7 @@ class ModuleWidget : public TQVBox class DockContainer : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: DockContainer(TQWidget *parent=0); diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index ca80619e5..b17581846 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -105,7 +105,7 @@ TQString KCGlobal::baseGroup() void KCGlobal::repairAccels( TQWidget * tw ) { - TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING ); + TQObjectList * l = tw->queryList( "TQAccel" ); TQObjectListIt it( *l ); // iterate over the buttons TQObject * obj; while ( (obj=it.current()) != 0 ) { // for each found object... diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp index 92b9cf0a0..293c5e1d8 100644 --- a/kcontrol/kcontrol/indexwidget.cpp +++ b/kcontrol/kcontrol/indexwidget.cpp @@ -60,7 +60,7 @@ void IndexWidget::resizeEvent(TQResizeEvent *e) void IndexWidget::moduleSelected(ConfigModule *m) { - const TQObject *obj = TQT_TQOBJECT_CONST(sender()); + const TQObject *obj = sender(); if(!m) return; emit moduleActivated(m); @@ -69,19 +69,19 @@ void IndexWidget::moduleSelected(ConfigModule *m) { _tree->makeVisible(m); - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(m); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } else if (obj->inherits("ModuleTreeView") && _icon) { _icon->makeVisible(m); - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(m); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -89,17 +89,17 @@ void IndexWidget::makeSelected(ConfigModule *module) { if (_icon) { - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(module); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } if (_tree) { - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(module); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -121,8 +121,8 @@ void IndexWidget::activateView(IndexViewMode mode) { _icon=new ModuleIconView(_modules, this); _icon->fill(); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } raiseWidget( _icon ); } @@ -132,10 +132,10 @@ void IndexWidget::activateView(IndexViewMode mode) { _tree=new ModuleTreeView(_modules, this); _tree->fill(); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); - connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SIGNAL(categorySelected(TQListViewItem*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SIGNAL(categorySelected(TQListViewItem*))); } raiseWidget( _tree ); } diff --git a/kcontrol/kcontrol/indexwidget.h b/kcontrol/kcontrol/indexwidget.h index 6471e0ec3..a373aafce 100644 --- a/kcontrol/kcontrol/indexwidget.h +++ b/kcontrol/kcontrol/indexwidget.h @@ -31,7 +31,7 @@ class ModuleIconView; class IndexWidget : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: IndexWidget(ConfigModuleList *list, TQWidget *parent, const char *name=0); diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 25ab4fc4a..7d709bce5 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -59,10 +59,10 @@ 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())); + connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest())); + connect (modIface, TQ_SIGNAL(handbookClicked()), toplevel, TQ_SLOT(slotHandbookRequest())); TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); TDEConfig *config = TDEGlobal::config(); @@ -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(); @@ -98,7 +98,7 @@ KControlApp::~KControlApp() delete toplevel; } -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDELocale::setMainCatalogue("kcontrol"); TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), diff --git a/kcontrol/kcontrol/main.h b/kcontrol/kcontrol/main.h index 783e10001..aaeabbe15 100644 --- a/kcontrol/kcontrol/main.h +++ b/kcontrol/kcontrol/main.h @@ -27,7 +27,7 @@ class TopLevel; class KControlApp : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KControlApp(); 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/moduleIface.h b/kcontrol/kcontrol/moduleIface.h index 17b4b07ad..00f2d0d39 100644 --- a/kcontrol/kcontrol/moduleIface.h +++ b/kcontrol/kcontrol/moduleIface.h @@ -28,7 +28,7 @@ class ModuleIface : public TQObject, public DCOPObject { -Q_OBJECT +TQ_OBJECT K_DCOP public: diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index 45be8a1ac..7c171f676 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -51,8 +51,8 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const // This is intentionally _not_ connected with executed(), since // honoring doubleclick doesn't make any sense here (changed by // large user demand) - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleIconView::makeSelected(ConfigModule *m) diff --git a/kcontrol/kcontrol/moduleiconview.h b/kcontrol/kcontrol/moduleiconview.h index 12cb14d73..daaeaa7ea 100644 --- a/kcontrol/kcontrol/moduleiconview.h +++ b/kcontrol/kcontrol/moduleiconview.h @@ -56,7 +56,7 @@ private: class ModuleIconView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ModuleIconView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index f203e6b57..2d1af0879 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -49,7 +49,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n fill(this, KCGlobal::baseGroup()); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); } void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) @@ -65,7 +65,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) // create new menu TDEPopupMenu *menu = new TDEPopupMenu(parentMenu); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. diff --git a/kcontrol/kcontrol/modulemenu.h b/kcontrol/kcontrol/modulemenu.h index 9ce39b584..890a2d857 100644 --- a/kcontrol/kcontrol/modulemenu.h +++ b/kcontrol/kcontrol/modulemenu.h @@ -40,7 +40,7 @@ class ConfigModuleList; class ModuleMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: ModuleMenu(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index e40d62568..c419e0d4e 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module() { _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root); - connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); - connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed())); - connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest())); - connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest())); - connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot())); + connect(_module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); + connect(_module, TQ_SIGNAL(closed()), this, TQ_SLOT(clientClosed())); + connect(_module, TQ_SIGNAL(handbookRequest()), this, TQ_SIGNAL(handbookRequest())); + connect(_module, TQ_SIGNAL(helpRequest()), this, TQ_SIGNAL(helpRequest())); + connect(_module, TQ_SIGNAL(runAsRoot()), this, TQ_SLOT(runAsRoot())); return _module; } @@ -157,7 +157,7 @@ void ConfigModule::runAsRoot() _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); _embedStack->raiseWidget(_busy); - connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); + connect(_embedWidget, TQ_SIGNAL( windowEmbedded(WId)), TQ_SLOT( embedded())); // prepare the process to run the tdecmshell TQString cmd = service()->exec().stripWhiteSpace(); @@ -198,7 +198,7 @@ void ConfigModule::runAsRoot() *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); } - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(rootExited(TDEProcess*))); if ( !_rootProcess->start(TDEProcess::NotifyOnExit) ) { diff --git a/kcontrol/kcontrol/modules.h b/kcontrol/kcontrol/modules.h index 63ddee668..16751831e 100644 --- a/kcontrol/kcontrol/modules.h +++ b/kcontrol/kcontrol/modules.h @@ -38,7 +38,7 @@ class TQWidgetStack; class ConfigModule : public TQObject, public TDECModuleInfo { - Q_OBJECT + TQ_OBJECT public: @@ -124,7 +124,7 @@ protected: class KControlEmbed : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: KControlEmbed( TQWidget* w ) : QXEmbed( w ) {} virtual void windowChanged( WId w ) { if( w ) emit windowEmbedded( w ); } diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index fd0bda8aa..a226cbc89 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -85,8 +85,8 @@ ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const new ModuleTreeWhatsThis( this ); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleTreeView::fill() @@ -340,7 +340,7 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu if (offset > 0) { TQPixmap pixmap(offset, offset); - pixmap.fill(Qt::color0); + pixmap.fill(TQt::color0); pixmap.setMask(pixmap.createHeuristicMask()); TQBitmap mask( pixmap.size(), true ); pixmap.setMask( mask ); diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index 271214c98..ad21d8715 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -66,7 +66,7 @@ private: class ModuleTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: ModuleTreeView(ConfigModuleList *list, TQWidget * parent = 0, const char * name = 0); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 893c75d7a..05040b3dd 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, view = new ProxyView(client, title, this, run_as_root, "proxyview"); (void) new WhatsThis( this ); - connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool))); - connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged())); + connect(_client, TQ_SIGNAL(changed(bool)), TQ_SLOT(clientChanged(bool))); + connect(_client, TQ_SIGNAL(quickHelpChanged()), TQ_SIGNAL(quickHelpChanged())); _sep = new KSeparator(KSeparator::HLine, this); @@ -225,11 +225,11 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, _apply->setEnabled( false ); _reset->setEnabled( false ); - connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked())); - connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked())); - connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked())); - connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked())); - connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked())); + connect(_handbook, TQ_SIGNAL(clicked()), TQ_SLOT(handbookClicked())); + connect(_default, TQ_SIGNAL(clicked()), TQ_SLOT(defaultClicked())); + connect(_apply, TQ_SIGNAL(clicked()), TQ_SLOT(applyClicked())); + connect(_reset, TQ_SIGNAL(clicked()), TQ_SLOT(resetClicked())); + connect(_root, TQ_SIGNAL(clicked()), TQ_SLOT(rootClicked())); TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -256,12 +256,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, ProxyWidget::~ProxyWidget() { -#ifdef USE_QT4 - #warning Possible memory leak in ProxyWidget::~ProxyWidget() -#else // USE_QT4 if (_client) delete _client; _client = 0; -#endif // USE_QT4 } TQString ProxyWidget::quickHelp() const diff --git a/kcontrol/kcontrol/proxywidget.h b/kcontrol/kcontrol/proxywidget.h index 804803c51..95d8a597d 100644 --- a/kcontrol/kcontrol/proxywidget.h +++ b/kcontrol/kcontrol/proxywidget.h @@ -38,7 +38,7 @@ class ProxyView; class ProxyWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 995d162e3..663a8744c 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -20,7 +20,6 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <tqsortedlist.h> #include <tqregexp.h> #include <klineedit.h> @@ -88,13 +87,13 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name) l->addWidget(_resultList); - connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT(slotKeywordSelected(const TQString&))); + connect(_keyList, TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT(slotKeywordSelected(const TQString&))); - connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)), - this, TQT_SLOT(slotModuleSelected(TQListBoxItem *))); - connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)), - this, TQT_SLOT(slotModuleClicked(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(selected(TQListBoxItem*)), + this, TQ_SLOT(slotModuleSelected(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(clicked(TQListBoxItem *)), + this, TQ_SLOT(slotModuleClicked(TQListBoxItem *))); } void SearchWidget::populateKeywordList(ConfigModuleList *list) diff --git a/kcontrol/kcontrol/searchwidget.h b/kcontrol/kcontrol/searchwidget.h index 2e6306bbc..d0f850218 100644 --- a/kcontrol/kcontrol/searchwidget.h +++ b/kcontrol/kcontrol/searchwidget.h @@ -50,7 +50,7 @@ class KeywordListEntry class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchWidget(TQWidget *parent, const char *name=0); diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 519ec91df..d3b2a3c2f 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -81,12 +81,12 @@ TopLevel::TopLevel(const char* name) _modules->readDesktopEntries(); for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) { - connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) ); - connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); + connect( m, TQ_SIGNAL( handbookRequest() ), this, TQ_SLOT( slotHandbookRequest() ) ); + connect( m, TQ_SIGNAL( helpRequest() ), this, TQ_SLOT( slotHelpRequest() ) ); } // create the layout box - _splitter = new TQSplitter( Qt::Horizontal, this ); + _splitter = new TQSplitter( TQt::Horizontal, this ); TQFrame* leftFrame = new TQFrame ( _splitter ); TQBoxLayout *leftFrameLayout = new TQVBoxLayout( leftFrame ); @@ -109,11 +109,11 @@ TopLevel::TopLevel(const char* name) KLineEdit *searchEdit = new KLineEdit( mSearchFrame ); clearButton->setFixedHeight( searchEdit->height() ); - connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), searchEdit, TQ_SLOT( clear() ) ); label->setBuddy( searchEdit ); searchLayout->addWidget( searchEdit ); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotSearchChanged(const TQString &) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotSearchChanged(const TQString &) ) ); // create the left hand side under search _stack = new TQWidgetStack( leftFrame ); @@ -121,18 +121,18 @@ TopLevel::TopLevel(const char* name) // index tab _index = new IndexWidget(_modules, this); - connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)), - this, TQT_SLOT(activateModule(ConfigModule*))); + connect(_index, TQ_SIGNAL(moduleActivated(ConfigModule*)), + this, TQ_SLOT(activateModule(ConfigModule*))); _stack->addWidget( _index ); - connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SLOT(categorySelected(TQListViewItem*))); + connect(_index, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SLOT(categorySelected(TQListViewItem*))); // search tab _search = new SearchWidget(this); _search->populateKeywordList(_modules); - connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)), - this, TQT_SLOT(activateModule(ConfigModule *))); + connect(_search, TQ_SIGNAL(moduleSelected(ConfigModule *)), + this, TQ_SLOT(activateModule(ConfigModule *))); _stack->addWidget( _search ); @@ -153,10 +153,10 @@ TopLevel::TopLevel(const char* name) // That one does the trick ... _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize ); - connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&))); - connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)), - TQT_SLOT(changedModule(ConfigModule*))); + connect(_dock, TQ_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(newModule(const TQString&, const TQString&, const TQString&))); + connect(_dock, TQ_SIGNAL(changedModule(ConfigModule*)), + TQ_SLOT(changedModule(ConfigModule*))); // set the main view setCentralWidget( _splitter ); @@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name) if (KCGlobal::isInfoCenter()) { AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem()); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 32 ), @@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name) else { AboutWidget *aw = new AboutWidget(this); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget(aw); } } @@ -234,40 +234,40 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); icon_view = new TDERadioAction - (i18n("&Icon View"), 0, TQT_TQOBJECT(this), TQT_SLOT(activateIconView()), + (i18n("&Icon View"), 0, this, TQ_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, TQ_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, TQ_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, TQ_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, TQ_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, TQ_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, TQ_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); createGUI("kcontrolui.rc"); @@ -275,7 +275,7 @@ actionCollection()); report_bug = actionCollection()->action("help_report_bug"); report_bug->setText(i18n("&Report Bug...")); report_bug->disconnect(); - connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug())); + connect(report_bug, TQ_SIGNAL(activated()), TQ_SLOT(reportBug())); } void TopLevel::activateIconView() @@ -399,8 +399,8 @@ void TopLevel::categorySelected(TQListViewItem *category) else { AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption ); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); } } @@ -495,7 +495,7 @@ void TopLevel::reportBug() } KBugReport *br = new KBugReport(this, false, dummyAbout); if (deleteit) - connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout())); + connect(br, TQ_SIGNAL(finished()), TQ_SLOT(deleteDummyAbout())); else dummyAbout = 0; br->show(); diff --git a/kcontrol/kcontrol/toplevel.h b/kcontrol/kcontrol/toplevel.h index 39aa25090..8d2a84145 100644 --- a/kcontrol/kcontrol/toplevel.h +++ b/kcontrol/kcontrol/toplevel.h @@ -41,7 +41,7 @@ class ModuleTitle; class TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: TopLevel( const char* name=0 ); |