TDE
/
tde-systemsettings
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-systemsettings
0
0
Fork 0
Code Issues Releases Wiki Activity

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/9/head
Michele Calgaro 11 months ago
parent d27c63f0f8
commit ae979b35ee
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

14
systemsettings/kcmultiwidget.cpp
Unescape View File

@ -82,7 +82,7 @@ KCMultiWidget::KCMultiWidget( int dialogFace, TQWidget * parent, const char * na
inline void KCMultiWidget::init() inline void KCMultiWidget::init()
{ {
connect( this, TQT_SIGNAL( finished()), TQT_SLOT( dialogClosed())); connect( this, TQ_SIGNAL( finished()), TQ_SLOT( dialogClosed()));
showButton( Ok, false ); showButton( Ok, false );
showButton( Cancel, false ); showButton( Cancel, false );
showButton( User1, true ); // Reset button showButton( User1, true ); // Reset button
@ -92,7 +92,7 @@ inline void KCMultiWidget::init()
enableButton(Apply, false); enableButton(Apply, false);
enableButton(User1, false); enableButton(User1, false);
connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *))); connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *)));
setInitialSize(TQSize(640,480)); setInitialSize(TQSize(640,480));
moduleParentComponents.setAutoDelete( true ); moduleParentComponents.setAutoDelete( true );
} }
@ -305,7 +305,7 @@ void KCMultiWidget::addModule(const TDECModuleInfo& moduleinfo,
moduleParentComponents.insert( module, moduleParentComponents.insert( module,
new TQStringList( parentComponents ) ); new TQStringList( parentComponents ) );
connect(module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); connect(module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool)));
} }
@ -391,14 +391,14 @@ void KCMultiWidget::slotAboutToShow(TQWidget *page)
enableButton( KDialogBase::Help, buttons & TDECModule::Help ); enableButton( KDialogBase::Help, buttons & TDECModule::Help );
enableButton( KDialogBase::Default, buttons & TDECModule::Default ); enableButton( KDialogBase::Default, buttons & TDECModule::Default );
disconnect( this, TQT_SIGNAL(user3Clicked()), 0, 0 ); disconnect( this, TQ_SIGNAL(user3Clicked()), 0, 0 );
if (d->currentModule->moduleInfo().needsRootPrivileges() && if (d->currentModule->moduleInfo().needsRootPrivileges() &&
!d->currentModule->rootMode() ) !d->currentModule->rootMode() )
{ /* Enable the Admin Mode button */ { /* Enable the Admin Mode button */
enableButton( User3, true ); enableButton( User3, true );
connect( this, TQT_SIGNAL(user3Clicked()), d->currentModule, TQT_SLOT( runAsRoot() )); connect( this, TQ_SIGNAL(user3Clicked()), d->currentModule, TQ_SLOT( runAsRoot() ));
connect( this, TQT_SIGNAL(user3Clicked()), TQT_SLOT( disableRModeButton() )); connect( this, TQ_SIGNAL(user3Clicked()), TQ_SLOT( disableRModeButton() ));
} else { } else {
enableButton( User3, false ); enableButton( User3, false );
} }
@ -412,7 +412,7 @@ void KCMultiWidget::rootExit()
void KCMultiWidget::disableRModeButton() void KCMultiWidget::disableRModeButton()
{ {
enableButton( User3, false ); enableButton( User3, false );
connect ( d->currentModule, TQT_SIGNAL( childClosed() ), TQT_SLOT( rootExit() ) ); connect ( d->currentModule, TQ_SIGNAL( childClosed() ), TQ_SLOT( rootExit() ) );
} }
void KCMultiWidget::slotCancel() { void KCMultiWidget::slotCancel() {

30
systemsettings/mainwindow.cpp
Unescape View File

@ -89,7 +89,7 @@ void MainWindow::buildMainWidget()
modulesScroller = new KCScrollView(moduleTabs); modulesScroller = new KCScrollView(moduleTabs);
ModulesView *modulesView = new ModulesView( menu, (*it).subMenu, modulesScroller->viewport(), "modulesView" ); ModulesView *modulesView = new ModulesView( menu, (*it).subMenu, modulesScroller->viewport(), "modulesView" );
modulesViewList.append(modulesView); modulesViewList.append(modulesView);
connect(modulesView, TQT_SIGNAL(itemSelected(TQIconViewItem* )), this, TQT_SLOT(slotItemSelected(TQIconViewItem*))); connect(modulesView, TQ_SIGNAL(itemSelected(TQIconViewItem* )), this, TQ_SLOT(slotItemSelected(TQIconViewItem*)));
modulesScroller->addChild(modulesView); modulesScroller->addChild(modulesView);
moduleTabs->addTab(modulesScroller, (*it).caption); moduleTabs->addTab(modulesScroller, (*it).caption);
overviewPages.append(modulesScroller); overviewPages.append(modulesScroller);
@ -103,23 +103,23 @@ void MainWindow::buildMainWidget()
void MainWindow::buildActions() void MainWindow::buildActions()
{ {
KStdAction::quit(this, TQT_SLOT( close() ), actionCollection()); KStdAction::quit(this, TQ_SLOT( close() ), actionCollection());
resetModule = new TDEAction(i18n("Undo Changes"), 0, this, resetModule = new TDEAction(i18n("Undo Changes"), 0, this,
TQT_SLOT(showAllModules()), actionCollection(), "resetModule" ); TQ_SLOT(showAllModules()), actionCollection(), "resetModule" );
resetModule->setEnabled(false); resetModule->setEnabled(false);
defaultModule = new TDEAction(i18n("Reset to Defaults"), 0, this, defaultModule = new TDEAction(i18n("Reset to Defaults"), 0, this,
TQT_SLOT(showAllModules()), actionCollection(), "defaultModule" ); TQ_SLOT(showAllModules()), actionCollection(), "defaultModule" );
defaultModule->setEnabled(false); defaultModule->setEnabled(false);
if( embeddedWindows ) { if( embeddedWindows ) {
showAllAction = new TDEAction(i18n("Overview"), TQApplication::reverseLayout() ? "forward" : "back", 0, this, showAllAction = new TDEAction(i18n("Overview"), TQApplication::reverseLayout() ? "forward" : "back", 0, this,
TQT_SLOT(showAllModules()), actionCollection(), "showAll" ); TQ_SLOT(showAllModules()), actionCollection(), "showAll" );
showAllAction->setEnabled(false); showAllAction->setEnabled(false);
} }
aboutModuleAction = new TDEAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutCurrentModule()), actionCollection(), "help_about_module"); aboutModuleAction = new TDEAction(i18n("About Current Module"), 0, this, TQ_SLOT(aboutCurrentModule()), actionCollection(), "help_about_module");
resetModuleHelp(); resetModuleHelp();
// Search // Search
@ -128,7 +128,7 @@ void MainWindow::buildActions()
KcmSearch* search = new KcmSearch(&modulesViewList, hbox, "search"); KcmSearch* search = new KcmSearch(&modulesViewList, hbox, "search");
hbox->setStretchFactor(search,1); hbox->setStretchFactor(search,1);
connect(search, TQT_SIGNAL(searchHits(const TQString &, int *, int)), this, TQT_SLOT(slotSearchHits(const TQString &, int *, int))); connect(search, TQ_SIGNAL(searchHits(const TQString &, int *, int)), this, TQ_SLOT(slotSearchHits(const TQString &, int *, int)));
TQVBox *vbox = new TQVBox(hbox); TQVBox *vbox = new TQVBox(hbox);
generalHitLabel = new TQLabel(vbox); generalHitLabel = new TQLabel(vbox);
@ -156,9 +156,9 @@ void MainWindow::buildActions()
// The Clear search box button. // The Clear search box button.
TDEToolBarButton *clearWidget = new TDEToolBarButton(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", TDEToolBarButton *clearWidget = new TDEToolBarButton(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
0, this); 0, this);
searchClear = new KWidgetAction( clearWidget, TQString(""), CTRL+Key_L, search, TQT_SLOT(clear()), searchClear = new KWidgetAction( clearWidget, TQString(""), CTRL+Key_L, search, TQ_SLOT(clear()),
actionCollection(), "searchReset"); actionCollection(), "searchReset");
connect(clearWidget, TQT_SIGNAL(clicked()), searchClear, TQT_SLOT(activate())); connect(clearWidget, TQ_SIGNAL(clicked()), searchClear, TQ_SLOT(activate()));
searchClear->setWhatsThis( i18n( "Reset Search\n" searchClear->setWhatsThis( i18n( "Reset Search\n"
"Resets the search so that " "Resets the search so that "
"all items are shown again." ) ); "all items are shown again." ) );
@ -175,7 +175,7 @@ void MainWindow::buildActions()
} }
TDERadioAction *newAction = new TDERadioAction( group->caption(), group->icon(), TDEShortcut(), this, TDERadioAction *newAction = new TDERadioAction( group->caption(), group->icon(), TDEShortcut(), this,
TQT_SLOT(slotTopPage()), actionCollection(), group->relPath().utf8() ); TQ_SLOT(slotTopPage()), actionCollection(), group->relPath().utf8() );
pageActions.append(newAction); pageActions.append(newAction);
kdDebug() << "relpath is :" << group->relPath() << endl; kdDebug() << "relpath is :" << group->relPath() << endl;
} }
@ -250,10 +250,10 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){
moduleItemToScrollerDict.insert(mItem,scrollView); moduleItemToScrollerDict.insert(mItem,scrollView);
moduleItemToWidgetDict.insert(mItem,groupWidget); moduleItemToWidgetDict.insert(mItem,groupWidget);
connect(groupWidget, TQT_SIGNAL(aboutToShow( TDECModuleProxy * )), this, TQT_SLOT(updateModuleHelp( TDECModuleProxy * ))); connect(groupWidget, TQ_SIGNAL(aboutToShow( TDECModuleProxy * )), this, TQ_SLOT(updateModuleHelp( TDECModuleProxy * )));
connect(groupWidget, TQT_SIGNAL(aboutToShowPage( TQWidget* )), this, TQT_SLOT(widgetChange())); connect(groupWidget, TQ_SIGNAL(aboutToShowPage( TQWidget* )), this, TQ_SLOT(widgetChange()));
connect(groupWidget, TQT_SIGNAL(finished()), this, TQT_SLOT(groupModulesFinished())); connect(groupWidget, TQ_SIGNAL(finished()), this, TQ_SLOT(groupModulesFinished()));
connect(groupWidget, TQT_SIGNAL(close()), this, TQT_SLOT(showAllModules())); connect(groupWidget, TQ_SIGNAL(close()), this, TQ_SLOT(showAllModules()));
TQValueList<TDECModuleInfo>::iterator it; TQValueList<TDECModuleInfo>::iterator it;
for ( it = list.begin(); it != list.end(); ++it ){ for ( it = list.begin(); it != list.end(); ++it ){
@ -286,7 +286,7 @@ void MainWindow::slotItemSelected( TQIconViewItem *item ){
// We resize and expand the window if neccessary, but only once the window has been updated. // We resize and expand the window if neccessary, but only once the window has been updated.
// Some modules seem to dynamically change thier size. The new size is only available // Some modules seem to dynamically change thier size. The new size is only available
// once the dialog is updated. :-/ -SBE // once the dialog is updated. :-/ -SBE
TQTimer::singleShot(0,this,TQT_SLOT(timerResize())); TQTimer::singleShot(0,this,TQ_SLOT(timerResize()));
} }
void MainWindow::timerResize() { void MainWindow::timerResize() {

4
systemsettings/modulesview.cpp
Unescape View File

@ -137,8 +137,8 @@ void ModulesView::createRow( const TQString &parentPath, TQBoxLayout *boxLayout
iconView->setItemsMovable( false ); iconView->setItemsMovable( false );
iconView->setSelectionMode(TQIconView::NoSelection); iconView->setSelectionMode(TQIconView::NoSelection);
groups.append( iconView ); groups.append( iconView );
connect(iconView, TQT_SIGNAL( clicked( TQIconViewItem* ) ), connect(iconView, TQ_SIGNAL( clicked( TQIconViewItem* ) ),
this, TQT_SIGNAL( itemSelected( TQIconViewItem* ) ) ); this, TQ_SIGNAL( itemSelected( TQIconViewItem* ) ) );
boxLayout->addWidget( iconView ); boxLayout->addWidget( iconView );
// Add all the items in their proper order // Add all the items in their proper order

Write Preview
Loading…
Cancel
Save