[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kalzium] /: normalize signals/slots
From: Montel Laurent <montel () kde ! org>
Date: 2011-07-31 19:56:30
Message-ID: 20110731195630.01ED5A60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 818bce99b359581af61fa17a56a95d4fa39184bb by Montel Laurent.
Committed on 31/07/2011 at 21:55.
Pushed by mlaurent into branch 'master'.
normalize signals/slots
M +19 -19 src/elementdataviewer.cpp
M +1 -1 src/tablesdialog.cpp
M +6 -6 src/isotopetable/isotopetabledialog.cpp
M +2 -2 plasmoid/applet/bodr/kalzium_plasma.cpp
M +3 -3 src/kdeeduglossary.cpp
M +4 -4 src/gradientwidget_impl.cpp
M +4 -4 src/isotopetable/isotopeguideview.cpp
M +4 -4 src/rsdialog.cpp
M +2 -2 plasmoid/applet/nuclearPlasmoid/nuclearCalculator.cpp
M +4 -4 src/molcalcwidget.cpp
M +5 -5 src/tools/obconverter.cpp
M +2 -2 src/exportdialog.cpp
M +2 -1 libscience/tests/xmlreadingtest.cpp
M +12 -12 src/spectrumviewimpl.cpp
M +5 -5 src/searchwidget.cpp
M +3 -3 src/calculator/calculator.cpp
M +4 -4 plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
M +2 -2 plasmoid/applet/psePlasmoid/Periodictable.cpp
M +6 -6 src/eqchemview.cpp
M +3 -3 src/detailinfodlg.cpp
M +4 -4 src/calculator/titrationCalculator.cpp
M +1 -1 src/psetable/periodictablescene.cpp
M +27 -27 src/kalzium.cpp
M +2 -1 src/unitsettingsdialog.cpp
M +14 -14 src/tools/moleculeview.cpp
http://commits.kde.org/kalzium/818bce99b359581af61fa17a56a95d4fa39184bb
diff --git a/libscience/tests/xmlreadingtest.cpp \
b/libscience/tests/xmlreadingtest.cpp index b1dc743..37f9a8f 100644
--- a/libscience/tests/xmlreadingtest.cpp
+++ b/libscience/tests/xmlreadingtest.cpp
@@ -190,4 +190,5 @@ int main(int argc, char *argv[])
// botype = botype.prepend( QLatin1String("bo:") );
//
// return botype;
-// }
\ No newline at end of file
+// }
+
diff --git a/plasmoid/applet/bodr/kalzium_plasma.cpp \
b/plasmoid/applet/bodr/kalzium_plasma.cpp index b836ea4..a4d9912 100644
--- a/plasmoid/applet/bodr/kalzium_plasma.cpp
+++ b/plasmoid/applet/bodr/kalzium_plasma.cpp
@@ -35,8 +35,8 @@ KalziumPlasma::KalziumPlasma(QObject *parent, const QVariantList \
&args) m_label1 = 0;
m_lineedit = new Plasma::LineEdit( this );
m_lineedit->setDefaultText( i18n("Enter the atomic number.") );
- connect( m_lineedit, SIGNAL(editingFinished() ),
- this, SLOT(textChanged() ) );
+ connect( m_lineedit, SIGNAL(editingFinished()),
+ this, SLOT(textChanged()) );
setHasConfigurationInterface(true);
setAcceptDrops(false);
diff --git a/plasmoid/applet/nuclearPlasmoid/nuclearCalculator.cpp \
b/plasmoid/applet/nuclearPlasmoid/nuclearCalculator.cpp index 970d56d..fb4baac 100644
--- a/plasmoid/applet/nuclearPlasmoid/nuclearCalculator.cpp
+++ b/plasmoid/applet/nuclearPlasmoid/nuclearCalculator.cpp
@@ -646,8 +646,8 @@ void \
nuclearCalculator::createConfigurationInterface(KConfigDialog *parent)
ui.massOnly->setChecked(m_massOnly);
- connect ( parent, SIGNAL ( applyClicked() ), this, SLOT ( configAccepted() ) );
- connect ( parent, SIGNAL ( okClicked() ), this, SLOT ( configAccepted() ) );
+ connect ( parent, SIGNAL (applyClicked()), this, SLOT (configAccepted()) );
+ connect ( parent, SIGNAL (okClicked()), this, SLOT (configAccepted()) );
connect (ui.massOnly, SIGNAL(toggled(bool)), parent, SLOT(settingsModified()));
}
diff --git a/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp \
b/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp index c8d1ea6..29db889 100644
--- a/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
+++ b/plasmoid/applet/psePlasmoid/Molmasscalculator.cpp
@@ -158,10 +158,10 @@ QGraphicsWidget *Molmasscalculator::graphicsWidget()
m_lineedit->setClearButtonShown ( true );
m_lineedit->setMinimumWidth ( 100 );
m_lineedit->setText ( i18n ( "C2H5OH" ) );
- connect ( m_lineedit, SIGNAL( textEdited(QString)), m_triggerTimer, SLOT( \
start() ) ); + connect ( m_lineedit, SIGNAL(textEdited(QString)), m_triggerTimer, \
SLOT(start()) );
m_switchButton = new Plasma::IconWidget();
- connect ( m_switchButton, SIGNAL( clicked() ), this, SLOT( toggleTable() ) );
+ connect ( m_switchButton, SIGNAL(clicked()), this, SLOT(toggleTable()) );
TopLayout->addItem ( MoleculeLabel );
TopLayout->addItem ( m_lineedit );
@@ -231,8 +231,8 @@ void Molmasscalculator::createConfigurationInterface ( \
KConfigDialog* parent )
m_ui.tabletyp->setCurrentIndex(m_PeriodWidget->getCurrentPseTyp());
- connect ( parent, SIGNAL ( applyClicked() ), this, SLOT ( configAccepted() ) );
- connect ( parent, SIGNAL ( okClicked() ), this, SLOT ( configAccepted() ) );
+ connect ( parent, SIGNAL (applyClicked()), this, SLOT (configAccepted()) );
+ connect ( parent, SIGNAL (okClicked()), this, SLOT (configAccepted()) );
connect (m_ui.showPeriodic, SIGNAL(toggled(bool)), parent, \
SLOT(settingsModified()));
connect (m_ui.copyToCliboard, SIGNAL(toggled(bool)), parent, \
SLOT(settingsModified()));
diff --git a/plasmoid/applet/psePlasmoid/Periodictable.cpp \
b/plasmoid/applet/psePlasmoid/Periodictable.cpp index 6e74e71..b9e0519 100644
--- a/plasmoid/applet/psePlasmoid/Periodictable.cpp
+++ b/plasmoid/applet/psePlasmoid/Periodictable.cpp
@@ -77,7 +77,7 @@ void PeriodicGrid::create()
element->setTextBackgroundColor(QColor ( r - color, g - color, b - \
color));
- connect ( element, SIGNAL ( ElementAction ( QString ) ), m_applet, SLOT \
( appendElement ( QString ) ) ); + connect ( element, SIGNAL \
(ElementAction(QString)), m_applet, SLOT (appendElement(QString)) );
m_actualPeriodSystem->addItem (element, period, group );
}
@@ -123,7 +123,7 @@ ElementLabel::ElementLabel ( int element, Plasma::Applet \
*applet, QGraphicsWidg setText ( thisElement["symbol"].toString() );
drawToolTip ( thisElement );
- connect ( this, SIGNAL ( clicked() ), this, SLOT ( ElementPressed() ) );
+ connect ( this, SIGNAL (clicked()), this, SLOT (ElementPressed()) );
}
#include "Periodictable.moc"
diff --git a/src/calculator/calculator.cpp b/src/calculator/calculator.cpp
index ae4bf56..74da319 100644
--- a/src/calculator/calculator.cpp
+++ b/src/calculator/calculator.cpp
@@ -63,13 +63,13 @@ calculator::calculator(QWidget *parent)
ui.pic->setPixmap( (KIcon( "calculate" )).pixmap(128,128) );
// Connect the tree item selection signal to the corresponding slot
- connect(ui.tree, SIGNAL(itemClicked(QTreeWidgetItem * , int)), this,
- SLOT(slotItemSelection(QTreeWidgetItem *)));
+ connect(ui.tree, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this,
+ SLOT(slotItemSelection(QTreeWidgetItem*)));
ui.tree->setCurrentItem ( ui.tree->topLevelItem(0), 0, \
QItemSelectionModel::ToggleCurrent );
// help clicked
- connect( this, SIGNAL( helpClicked() ), this, SLOT( slotHelp() ) );
+ connect( this, SIGNAL(helpClicked()), this, SLOT(slotHelp()) );
}
calculator :: ~calculator()
diff --git a/src/calculator/titrationCalculator.cpp \
b/src/calculator/titrationCalculator.cpp index 24d79eb..522c7ee 100644
--- a/src/calculator/titrationCalculator.cpp
+++ b/src/calculator/titrationCalculator.cpp
@@ -61,10 +61,10 @@ titrationCalculator::titrationCalculator(QWidget * parent)
plot();
connect(uid.pushButton, SIGNAL(clicked()),this, SLOT(on_pushButton_clicked()));
- connect(uid.xmin, SIGNAL(valueChanged(double )),this, \
SLOT(on_xmin_valueChanged(double )));
- connect(uid.xmax, SIGNAL(valueChanged(double )),this, \
SLOT(on_xmax_valueChanged(double )));
- connect(uid.ymin, SIGNAL(valueChanged(double )),this, \
SLOT(on_ymin_valueChanged(double )));
- connect(uid.ymax, SIGNAL(valueChanged(double )),this, \
SLOT(on_ymax_valueChanged(double ))); + connect(uid.xmin, \
SIGNAL(valueChanged(double)),this, SLOT(on_xmin_valueChanged(double))); + \
connect(uid.xmax, SIGNAL(valueChanged(double)),this, \
SLOT(on_xmax_valueChanged(double))); + connect(uid.ymin, \
SIGNAL(valueChanged(double)),this, SLOT(on_ymin_valueChanged(double))); + \
connect(uid.ymax, SIGNAL(valueChanged(double)),this, \
SLOT(on_ymax_valueChanged(double)));
connect(uid.saveimage, SIGNAL(clicked()),this, \
SLOT(on_actionSave_image_triggered()));
diff --git a/src/detailinfodlg.cpp b/src/detailinfodlg.cpp
index ff6df62..cc2aa1d 100644
--- a/src/detailinfodlg.cpp
+++ b/src/detailinfodlg.cpp
@@ -65,9 +65,9 @@ DetailedInfoDlg::DetailedInfoDlg( int el , QWidget *parent )
m_actionCollection = new KActionCollection(this);
KStandardAction::quit(this, SLOT(close()), m_actionCollection);
- connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotUser1() ) );
- connect( this, SIGNAL( user2Clicked() ), this, SLOT( slotUser2() ) );
- connect( this, SIGNAL( helpClicked() ), this, SLOT( slotHelp() ) );
+ connect( this, SIGNAL(user1Clicked()), this, SLOT(slotUser1()) );
+ connect( this, SIGNAL(user2Clicked()), this, SLOT(slotUser2()) );
+ connect( this, SIGNAL(helpClicked()), this, SLOT(slotHelp()) );
// setting the element and updating the whole dialog
setElement( el );
diff --git a/src/elementdataviewer.cpp b/src/elementdataviewer.cpp
index fbf3c78..a64c2b4 100644
--- a/src/elementdataviewer.cpp
+++ b/src/elementdataviewer.cpp
@@ -70,25 +70,25 @@ ElementDataViewer::ElementDataViewer( QWidget *parent )
}
m_actionCollection = new KActionCollection (this );
- KStandardAction::quit( this, SLOT( close() ), m_actionCollection );
-
- connect( m_timer, SIGNAL( timeout() ),
- this, SLOT( drawPlot() ) );
- connect( ui.KCB_y, SIGNAL( activated(int) ),
- this, SLOT( rangeChanged()) );
- connect( ui.KCB_x, SIGNAL( activated(int) ),
- this, SLOT( rangeChanged()) );
- connect( ui.comboElementLabels, SIGNAL( activated( int ) ),
- this, SLOT( rangeChanged()) );
- connect( ui.comboElementType, SIGNAL( activated( int ) ),
- this, SLOT( rangeChanged()) );
- connect( ui.from, SIGNAL( valueChanged( int ) ),
- this, SLOT( rangeChanged() ) );
- connect( ui.to, SIGNAL( valueChanged( int ) ),
- this, SLOT( rangeChanged() ) );
- connect( this, SIGNAL( helpClicked() ), this, SLOT( slotHelp() ) );
- connect( ui.full, SIGNAL ( clicked() ) ,
- this, SLOT( fullRange() ) );
+ KStandardAction::quit( this, SLOT(close()), m_actionCollection );
+
+ connect( m_timer, SIGNAL(timeout()),
+ this, SLOT(drawPlot()) );
+ connect( ui.KCB_y, SIGNAL(activated(int)),
+ this, SLOT(rangeChanged()) );
+ connect( ui.KCB_x, SIGNAL(activated(int)),
+ this, SLOT(rangeChanged()) );
+ connect( ui.comboElementLabels, SIGNAL(activated(int)),
+ this, SLOT(rangeChanged()) );
+ connect( ui.comboElementType, SIGNAL(activated(int)),
+ this, SLOT(rangeChanged()) );
+ connect( ui.from, SIGNAL(valueChanged(int)),
+ this, SLOT(rangeChanged()) );
+ connect( ui.to, SIGNAL(valueChanged(int)),
+ this, SLOT(rangeChanged()) );
+ connect( this, SIGNAL(helpClicked()), this, SLOT(slotHelp()) );
+ connect( ui.full, SIGNAL (clicked()) ,
+ this, SLOT(fullRange()) );
drawPlot();
resize( 650, 500 );
diff --git a/src/eqchemview.cpp b/src/eqchemview.cpp
index c07fbd4..7c6581b 100644
--- a/src/eqchemview.cpp
+++ b/src/eqchemview.cpp
@@ -72,12 +72,12 @@ EQChemDialog::EQChemDialog( QWidget *parent )
ui.setupUi( mainWidget() );
setButtonGuiItem( User1, KGuiItem( i18n( "Copy" ), "edit-copy", i18n( "Copy \
answer to clipboard" ) ) );
- connect( ui.calculateButton , SIGNAL( clicked() ),
- this, SLOT( compute() ) );
- connect( this , SIGNAL( user1Clicked() ),
- this, SLOT( copyAnswer() ) );
- connect( this , SIGNAL( helpClicked() ),
- this, SLOT( slotHelp() ) );
+ connect( ui.calculateButton , SIGNAL(clicked()),
+ this, SLOT(compute()) );
+ connect( this , SIGNAL(user1Clicked()),
+ this, SLOT(copyAnswer()) );
+ connect( this , SIGNAL(helpClicked()),
+ this, SLOT(slotHelp()) );
}
void EQChemDialog::copyAnswer()
diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp
index 8123cfc..5e621aa 100644
--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@@ -88,8 +88,8 @@ ExportDialog::ExportDialog( QWidget * parent )
ui.formatList->addItem( ".xml (raw element data)", "xml" );
ui.formatList->addItem( ".csv (comma-separated data)", "csv" );
- connect( this, SIGNAL( user1Clicked() ), this, SLOT( slotOkClicked() ) );
- connect( this, SIGNAL( helpClicked() ), this, SLOT( slotHelpClicked() ) );
+ connect( this, SIGNAL(user1Clicked()), this, SLOT(slotOkClicked()) );
+ connect( this, SIGNAL(helpClicked()), this, SLOT(slotHelpClicked()) );
setHelp(QString(),"kalzium");
}
diff --git a/src/gradientwidget_impl.cpp b/src/gradientwidget_impl.cpp
index 651100b..f33695f 100644
--- a/src/gradientwidget_impl.cpp
+++ b/src/gradientwidget_impl.cpp
@@ -35,12 +35,12 @@ GradientWidgetImpl::GradientWidgetImpl( QWidget *parent )
scheme_combo->addItems( KalziumElementProperty::instance()->schemeList() );
gradient_combo->addItems( KalziumElementProperty::instance()->gradientList() );
- connect( gradient_spinbox, SIGNAL( valueChanged(double)), this, SLOT( \
doubleToSlider(double)));
- connect( gradient_slider, SIGNAL( valueChanged(int)), this, SLOT( \
intToSpinbox(int))); + connect( gradient_spinbox, SIGNAL(valueChanged(double)), \
this, SLOT(doubleToSlider(double))); + connect( gradient_slider, \
SIGNAL(valueChanged(int)), this, SLOT(intToSpinbox(int)));
m_timer = new QTimer( this );
- connect( Play, SIGNAL (clicked()), this, SLOT( play()));
- connect( m_timer, SIGNAL(timeout()), this, SLOT( tick()) );
+ connect( Play, SIGNAL (clicked()), this, SLOT(play()));
+ connect( m_timer, SIGNAL(timeout()), this, SLOT(tick()) );
Play->setIcon( KIcon( "media-playback-start" ) );
}
diff --git a/src/isotopetable/isotopeguideview.cpp \
b/src/isotopetable/isotopeguideview.cpp index a247c53..b833150 100644
--- a/src/isotopetable/isotopeguideview.cpp
+++ b/src/isotopetable/isotopeguideview.cpp
@@ -36,10 +36,10 @@
void IsotopeGuideView::setGuidedView(IsotopeView *guidedView)
{
m_guidedView = guidedView;
- connect( m_guidedView, SIGNAL( zoomLevelChanged( double ) ),
- this, SLOT( setZoomLevel( double ) ) );
- connect( m_guidedView, SIGNAL( visibleSceneRectChanged( const QPolygonF& ) ),
- this, SLOT( setVisibleSceneRect( const QPolygonF& ) ) );
+ connect( m_guidedView, SIGNAL(zoomLevelChanged(double)),
+ this, SLOT(setZoomLevel(double)) );
+ connect( m_guidedView, SIGNAL(visibleSceneRectChanged(QPolygonF)),
+ this, SLOT(setVisibleSceneRect(QPolygonF)) );
m_zoomLevel = m_guidedView->zoomLevel();
setScene(m_guidedView->scene());
diff --git a/src/isotopetable/isotopetabledialog.cpp \
b/src/isotopetable/isotopetabledialog.cpp index 6bad1ed6..1f6f544 100644
--- a/src/isotopetable/isotopetabledialog.cpp
+++ b/src/isotopetable/isotopetabledialog.cpp
@@ -42,12 +42,12 @@ IsotopeTableDialog::IsotopeTableDialog( QWidget* parent )
ui.setupUi( mainWidget() );
ui.guide->setGuidedView( ui.gv );
- connect( ui.gv->scene(), SIGNAL( itemSelected(IsotopeItem*) ),
- this, SLOT( updateDockWidget( IsotopeItem*) ) );
- connect( ui.gv, SIGNAL( zoomLevelChanged( double ) ),
- this, SLOT( slotZoomLevelChanged( double ) ) );
- connect( ui.Slider, SIGNAL( valueChanged( int ) ),
- this, SLOT( zoom ( int ) ));
+ connect( ui.gv->scene(), SIGNAL(itemSelected(IsotopeItem*)),
+ this, SLOT(updateDockWidget(IsotopeItem*)) );
+ connect( ui.gv, SIGNAL(zoomLevelChanged(double)),
+ this, SLOT(slotZoomLevelChanged(double)) );
+ connect( ui.Slider, SIGNAL(valueChanged(int)),
+ this, SLOT(zoom(int)));
//Here comes the legend part
QList< QPair<QString, QColor> > items;
diff --git a/src/kalzium.cpp b/src/kalzium.cpp
index e08529a..d734705 100644
--- a/src/kalzium.cpp
+++ b/src/kalzium.cpp
@@ -109,10 +109,10 @@ Kalzium::Kalzium() : KXmlGuiWindow( 0 )
m_periodicTable = new PeriodicTableView( pseTempWidget );
// Connecting the search to the periodic table
- connect( newsearch, SIGNAL( searchChanged() ),
- KalziumElementProperty::instance(), SIGNAL( propertyChanged() ) );
- connect( newsearch, SIGNAL( searchReset() ),
- KalziumElementProperty::instance(), SIGNAL( propertyChanged() ) );
+ connect( newsearch, SIGNAL(searchChanged()),
+ KalziumElementProperty::instance(), SIGNAL(propertyChanged()) );
+ connect( newsearch, SIGNAL(searchReset()),
+ KalziumElementProperty::instance(), SIGNAL(propertyChanged()) );
layout->addWidget( searchWidget );
layout->addWidget( m_periodicTable );
@@ -150,7 +150,7 @@ void Kalzium::setupActions()
{
export_action = actionCollection()->add<QAction>( "file_exporter" );
export_action->setText( i18n("&Export Data...") );
- connect( export_action, SIGNAL( triggered( bool ) ), this, SLOT( \
slotShowExportDialog() ) ); + connect( export_action, SIGNAL(triggered(bool)), \
this, SLOT(slotShowExportDialog()) );
// the action for swiching look: color schemes and gradients
QStringList schemes = KalziumElementProperty::instance()->schemeList(); \
/*KalziumSchemeTypeFactory::instance()->schemes();*/ @@ -162,7 +162,7 @@ void \
Kalzium::setupActions() look_action_schemes->setItems( schemes );
look_action_schemes->setToolBarMode( KSelectAction::MenuMode );
look_action_schemes->setToolButtonPopupMode( QToolButton::InstantPopup );
- connect( look_action_schemes, SIGNAL( triggered( int ) ), this, SLOT( \
slotSwitchtoLookScheme( int ) ) ); + connect( look_action_schemes, \
SIGNAL(triggered(int)), this, SLOT(slotSwitchtoLookScheme(int)) );
// the action for swiching look: gradients
look_action_gradients = actionCollection()->add<KSelectAction>( \
"view_look_onlygradients" ); @@ -170,7 +170,7 @@ void Kalzium::setupActions()
look_action_gradients->setItems( gradients );
look_action_gradients->setToolBarMode( KSelectAction::MenuMode );
look_action_gradients->setToolButtonPopupMode( QToolButton::InstantPopup );
- connect( look_action_gradients, SIGNAL( triggered( int ) ), this, SLOT( \
slotSwitchtoLookGradient( int ) ) ); + connect( look_action_gradients, \
SIGNAL(triggered(int)), this, SLOT(slotSwitchtoLookGradient(int)) );
// the action for swiching tables
QStringList table_schemes = pseTables::instance()->tables();
@@ -178,14 +178,14 @@ void Kalzium::setupActions()
table_action->setText( i18n( "&Tables" ) );
table_action->setItems(table_schemes);
table_action->setCurrentItem(Prefs::table());
- connect( table_action, SIGNAL( triggered( int ) ), this, SLOT( \
slotSwitchtoTable( int ) ) ); + connect( table_action, SIGNAL(triggered(int)), \
this, SLOT(slotSwitchtoTable(int)) );
// the actions for switching numeration
numeration_action = actionCollection()->add<KSelectAction>( \
"view_numerationtype" ); numeration_action->setText( i18n( "&Numeration" ) );
numeration_action->setItems( \
KalziumNumerationTypeFactory::instance()->numerations() ); \
numeration_action->setCurrentItem(Prefs::numeration());
- connect( numeration_action, SIGNAL( triggered( int ) ), this, SLOT( \
slotSwitchtoNumeration( int ) ) ); + connect( numeration_action, \
SIGNAL(triggered(int)), this, SLOT(slotSwitchtoNumeration(int)) );
m_EQSolverAction = actionCollection()->addAction( "tools_eqsolver" );
m_EQSolverAction->setText( i18n( "&Equation Solver..." ) );
@@ -193,7 +193,7 @@ void Kalzium::setupActions()
m_EQSolverAction->setWhatsThis( i18nc( "WhatsThis Help", "This tool allows you \
to solve chemical equations." ) );
#ifdef HAVE_FACILE
- connect( m_EQSolverAction, SIGNAL( triggered() ), this, SLOT( slotShowEQSolver() \
) ); + connect( m_EQSolverAction, SIGNAL(triggered()), this, \
SLOT(slotShowEQSolver()) ); m_EQSolverAction->setEnabled( true );
#else
m_EQSolverAction->setEnabled( false );
@@ -203,36 +203,36 @@ void Kalzium::setupActions()
m_pPlotAction = actionCollection()->addAction( "tools_plotdata" );
m_pPlotAction->setText( i18n( "&Plot Data..." ) );
m_pPlotAction->setIcon( KIcon( "plot" ) );
- connect( m_pPlotAction, SIGNAL( triggered() ), this, SLOT( slotPlotData() ) );
+ connect( m_pPlotAction, SIGNAL(triggered()), this, SLOT(slotPlotData()) );
// calculator actions
m_pcalculator = actionCollection()->addAction( "tools_calculate" );
m_pcalculator->setText( i18n( "Perform &Calculations..." ) );
m_pcalculator->setIcon( KIcon( "calculate" ) );
m_pcalculator->setWhatsThis( i18nc( "WhatsThis Help", "This is the calculator, \
it performs basic chemical calculations." ) );
- connect( m_pcalculator, SIGNAL( triggered() ), this, SLOT( showCalculator() ) );
+ connect( m_pcalculator, SIGNAL(triggered()), this, SLOT(showCalculator()) );
m_pIsotopeTableAction= actionCollection()->addAction( "tools_isotopetable" );
m_pIsotopeTableAction->setText( i18n( "&Isotope Table..." ) );
m_pIsotopeTableAction->setIcon( KIcon( "isotopemap" ) );
m_pIsotopeTableAction->setWhatsThis( i18nc( "WhatsThis Help", "This table shows \
all of the known isotopes of the chemical elements." ) );
- connect( m_pIsotopeTableAction, SIGNAL( triggered() ), this, SLOT( \
slotIsotopeTable() ) ); + connect( m_pIsotopeTableAction, SIGNAL(triggered()), \
this, SLOT(slotIsotopeTable()) );
m_pGlossaryAction = actionCollection()->addAction( "tools_glossary" );
m_pGlossaryAction->setText(i18n( "&Glossary..." ) );
m_pGlossaryAction->setIcon( KIcon( "glossary" ) );
- connect( m_pGlossaryAction, SIGNAL( triggered() ), this, SLOT( slotGlossary() ) \
); + connect( m_pGlossaryAction, SIGNAL(triggered()), this, SLOT(slotGlossary()) \
);
m_pRSAction = actionCollection()->addAction( "tools_rs" );
m_pRSAction->setText( i18n( "&R/S Phrases..." ) );
m_pRSAction->setIcon( KIcon( "kalzium_rs" ) );
- connect( m_pRSAction, SIGNAL( triggered() ), this, SLOT( slotRS() ) );
+ connect( m_pRSAction, SIGNAL(triggered()), this, SLOT(slotRS()) );
m_pOBConverterAction = actionCollection()->addAction( "tools_obconverter" );
m_pOBConverterAction->setText( i18n( "Convert chemical files..." ) );
m_pOBConverterAction->setIcon( KIcon( "edit-copy" ) );
m_pOBConverterAction->setWhatsThis( i18nc( "WhatsThis Help", "With this tool, \
you can convert files containing chemical data between various file \
formats." ) );
- connect( m_pOBConverterAction, SIGNAL( triggered() ), this, SLOT( \
slotOBConverter() ) ); + connect( m_pOBConverterAction, SIGNAL(triggered()), this, \
SLOT(slotOBConverter()) ); #ifndef HAVE_OPENBABEL2
m_pOBConverterAction->setEnabled( false );
#endif
@@ -241,7 +241,7 @@ void Kalzium::setupActions()
m_pMoleculesviewer->setText( i18n( "Molecular Editor..." ) );
m_pMoleculesviewer->setIcon( KIcon( "kalzium_molviewer" ) );
m_pMoleculesviewer->setWhatsThis( i18nc( "WhatsThis Help", "This tool allows you \
to view and edit 3D molecular structures." ) );
- connect( m_pMoleculesviewer, SIGNAL( triggered() ), this, SLOT( \
slotMoleculeviewer() ) ); + connect( m_pMoleculesviewer, SIGNAL(triggered()), \
this, SLOT(slotMoleculeviewer()) ); #if !defined(HAVE_OPENBABEL2) || \
!defined(HAVE_EIGEN) || !defined(HAVE_AVOGADRO) m_pMoleculesviewer->setEnabled( \
false ); #endif
@@ -251,7 +251,7 @@ void Kalzium::setupActions()
m_pTables->setIcon( KIcon( "kalzium_tables" ) );
m_pTables->setWhatsThis(i18nc("WhatsThis Help", "This will open a dialog with \
listings of symbols and numbers related to chemistry."));
- connect( m_pTables, SIGNAL( triggered() ), this, SLOT( slotTables() ) );
+ connect( m_pTables, SIGNAL(triggered()), this, SLOT(slotTables()) );
// other period view options
m_pLegendAction = m_legendDock->toggleViewAction();
@@ -337,12 +337,12 @@ void Kalzium::setupSidebars()
m_gradientWidget = new GradientWidgetImpl( m_toolbox );
m_gradientWidget->setObjectName( "viewtWidget" );
- connect( m_gradientWidget, SIGNAL( gradientValueChanged( double ) ),
- KalziumElementProperty::instance(), SLOT( setSliderValue( double ) ) );
- connect( m_gradientWidget->scheme_combo, SIGNAL( currentIndexChanged(int)),
- this, SLOT( slotSwitchtoLookScheme(int)));
- connect( m_gradientWidget->gradient_combo, SIGNAL( currentIndexChanged(int)),
- this, SLOT( slotSwitchtoLookGradient(int)));
+ connect( m_gradientWidget, SIGNAL(gradientValueChanged(double)),
+ KalziumElementProperty::instance(), SLOT(setSliderValue(double)) );
+ connect( m_gradientWidget->scheme_combo, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(slotSwitchtoLookScheme(int)));
+ connect( m_gradientWidget->gradient_combo, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(slotSwitchtoLookGradient(int)));
m_toolbox->addItem( m_gradientWidget, KIcon( "statematter" ), i18n( "View" ) );
@@ -546,9 +546,9 @@ void Kalzium::showSettingsDialog()
ui_calc.setupUi( w_calc );
dialog->addPage( w_calc, i18n("Calculator"), "accessories-calculator");
- connect( dialog, SIGNAL( settingsChanged(QString) ), this, \
SLOT(slotUpdateSettings() ) );
- connect( dialog, SIGNAL( settingsChanged( const QString &) ), m_gradientWidget, \
SLOT( slotGradientChanged()) );
- connect( dialog, SIGNAL( settingsChanged( const QString &) ), m_legendWidget, \
SLOT( updateContent() ) ); + connect( dialog, SIGNAL(settingsChanged(QString)), \
this, SLOT(slotUpdateSettings()) ); + connect( dialog, \
SIGNAL(settingsChanged(QString)), m_gradientWidget, SLOT(slotGradientChanged()) ); + \
connect( dialog, SIGNAL(settingsChanged(QString)), m_legendWidget, \
SLOT(updateContent()) );
dialog->show();
}
diff --git a/src/kdeeduglossary.cpp b/src/kdeeduglossary.cpp
index 0ff3a43..84fe531 100644
--- a/src/kdeeduglossary.cpp
+++ b/src/kdeeduglossary.cpp
@@ -356,9 +356,9 @@ GlossaryDialog::GlossaryDialog( QWidget *parent )
d->m_htmlpart = new KHTMLPart( vs );
- connect( d->m_htmlpart->browserExtension(), SIGNAL( openUrlRequestDelayed( const \
KUrl &, const KParts::OpenUrlArguments &, const \
KParts::BrowserArguments & ) ),
- this, SLOT( displayItem( const KUrl &, const KParts::OpenUrlArguments \
&, const KParts::BrowserArguments & ) ) );
- connect( d->m_glosstree, SIGNAL( itemActivated( QTreeWidgetItem * , int ) ), this, \
SLOT( itemActivated( QTreeWidgetItem * , int ) ) ); + connect( \
d->m_htmlpart->browserExtension(), \
SIGNAL(openUrlRequestDelayed(KUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)),
+ this, \
SLOT(displayItem(KUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)) ); \
+ connect( d->m_glosstree, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, \
SLOT(itemActivated(QTreeWidgetItem*,int)) );
resize( 600, 400 );
}
diff --git a/src/molcalcwidget.cpp b/src/molcalcwidget.cpp
index 32169c1..907cd6a 100644
--- a/src/molcalcwidget.cpp
+++ b/src/molcalcwidget.cpp
@@ -51,9 +51,9 @@ MolcalcWidget::MolcalcWidget( QWidget *parent )
ui.setupUi( this );
- connect( ui.calcButton, SIGNAL( clicked() ), this, SLOT( slotCalculate() ) );
- connect( ui.formulaEdit, SIGNAL( returnPressed() ), this, SLOT( slotCalculate() \
) );
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( slotCalculate() ) );
+ connect( ui.calcButton, SIGNAL(clicked()), this, SLOT(slotCalculate()) );
+ connect( ui.formulaEdit, SIGNAL(returnPressed()), this, SLOT(slotCalculate()) );
+ connect( m_timer, SIGNAL(timeout()), this, SLOT(slotCalculate()) );
ui.formulaEdit->setClearButtonShown(true);
@@ -67,7 +67,7 @@ MolcalcWidget::MolcalcWidget( QWidget *parent )
if (Prefs::addAlias())
{
- connect( ui.alias, SIGNAL(clicked()), this, SLOT( addAlias()));
+ connect( ui.alias, SIGNAL(clicked()), this, SLOT(addAlias()));
QString shortForm, fullForm; // short form (symbol) and full form (expansion)
QList<QString> shortList, fullList; // Used to store the short and full forms
int i = 0; // loop counter
diff --git a/src/psetable/periodictablescene.cpp \
b/src/psetable/periodictablescene.cpp index 75514e2..b7b08e7 100644
--- a/src/psetable/periodictablescene.cpp
+++ b/src/psetable/periodictablescene.cpp
@@ -45,7 +45,7 @@ PeriodicTableScene::PeriodicTableScene(QObject *parent)
setItemIndexMethod(QGraphicsScene::NoIndex);
m_hoverTimer.setSingleShot( true );
- connect( &m_hoverTimer, SIGNAL( timeout() ), this, SLOT( slotMouseover() ) );
+ connect( &m_hoverTimer, SIGNAL(timeout()), this, SLOT(slotMouseover()) );
}
PeriodicTableScene::~PeriodicTableScene()
diff --git a/src/rsdialog.cpp b/src/rsdialog.cpp
index 73edaf5..59b1727 100644
--- a/src/rsdialog.cpp
+++ b/src/rsdialog.cpp
@@ -42,10 +42,10 @@ RSDialog::RSDialog( QWidget* parent )
ui.setupUi( mainWidget() );
- connect( ui.filterButton, SIGNAL( clicked() ),
- this, SLOT( filter() ) );
- connect( this, SIGNAL( helpClicked() ),
- this, SLOT( slotHelp() ) );
+ connect( ui.filterButton, SIGNAL(clicked()),
+ this, SLOT(filter()) );
+ connect( this, SIGNAL(helpClicked()),
+ this, SLOT(slotHelp()) );
filter();
}
diff --git a/src/searchwidget.cpp b/src/searchwidget.cpp
index 053aeb2..a4db6d8 100644
--- a/src/searchwidget.cpp
+++ b/src/searchwidget.cpp
@@ -40,10 +40,10 @@ SearchWidget::SearchWidget( QWidget *parent )
m_searchLine = new KLineEdit( this );
m_searchLine->setClearButtonShown(true);
m_searchLine->setTrapReturnKey(true);
- connect( m_searchLine, SIGNAL( textChanged( const QString& ) ),
- this, SLOT( searchTextChanged( const QString& ) ) );
- connect( m_searchLine, SIGNAL( returnPressed() ),
- this, SLOT( slotReturnPressed() ) );
+ connect( m_searchLine, SIGNAL(textChanged(QString)),
+ this, SLOT(searchTextChanged(QString)) );
+ connect( m_searchLine, SIGNAL(returnPressed()),
+ this, SLOT(slotReturnPressed()) );
mainlay->addWidget( m_searchLine );
}
@@ -69,7 +69,7 @@ void SearchWidget::searchTextChanged( const QString& )
{
m_timer = new QTimer( this );
m_timer->setSingleShot( true );
- connect( m_timer, SIGNAL( timeout() ), this, SLOT( doSearch() ) );
+ connect( m_timer, SIGNAL(timeout()), this, SLOT(doSearch()) );
}
// 1/3 of second should be ok
m_timer->start( 333 );
diff --git a/src/spectrumviewimpl.cpp b/src/spectrumviewimpl.cpp
index 2b16cdd..0327202 100644
--- a/src/spectrumviewimpl.cpp
+++ b/src/spectrumviewimpl.cpp
@@ -38,23 +38,23 @@ SpectrumViewImpl::SpectrumViewImpl( QWidget *parent )
m_spectrumType->setCurrentIndex( Prefs::spectrumType() );
- connect( minimumValue, SIGNAL( valueChanged( int ) ),
- m_spectrumWidget, SLOT( setLeftBorder( int ) ) );
- connect( maximumValue, SIGNAL( valueChanged( int ) ),
- m_spectrumWidget, SLOT( setRightBorder( int ) ) );
- connect( m_spectrumWidget, SIGNAL( bordersChanged(int,int) ),
- this, SLOT( updateUI(int,int) ) );
+ connect( minimumValue, SIGNAL(valueChanged(int)),
+ m_spectrumWidget, SLOT(setLeftBorder(int)) );
+ connect( maximumValue, SIGNAL(valueChanged(int)),
+ m_spectrumWidget, SLOT(setRightBorder(int)) );
+ connect( m_spectrumWidget, SIGNAL(bordersChanged(int,int)),
+ this, SLOT(updateUI(int,int)) );
connect( m_spectrumWidget, SIGNAL(peakSelected(Spectrum::peak*)),
this, SLOT(updatePeakInformation(Spectrum::peak*)));
- connect( m_spectrumType, SIGNAL( currentIndexChanged( int ) ),
- m_spectrumWidget, SLOT( slotActivateSpectrum( int ) ));
+ connect( m_spectrumType, SIGNAL(currentIndexChanged(int)),
+ m_spectrumWidget, SLOT(slotActivateSpectrum(int)));
- connect( btn_resetZoom, SIGNAL( pressed() ), m_spectrumWidget, SLOT( \
resetSpectrum() ));
- connect( this, SIGNAL( settingsChanged() ), m_spectrumWidget, SLOT( \
resetSpectrum() )); + connect( btn_resetZoom, SIGNAL(pressed()), m_spectrumWidget, \
SLOT(resetSpectrum())); + connect( this, SIGNAL(settingsChanged()), \
m_spectrumWidget, SLOT(resetSpectrum()));
- connect( m_lengthUnit, SIGNAL( currentIndexChanged( int ) ),
- this, SLOT( setUnit() ));
+ connect( m_lengthUnit, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(setUnit()));
resize( minimumSizeHint() );
}
diff --git a/src/tablesdialog.cpp b/src/tablesdialog.cpp
index 8ed386b..271d37c 100644
--- a/src/tablesdialog.cpp
+++ b/src/tablesdialog.cpp
@@ -263,7 +263,7 @@ MyTableWidget::MyTableWidget( QWidget* parent )
void MyTableWidget::contextMenuEvent( QContextMenuEvent* event )
{
QMenu* menu = new QMenu( (QWidget*) sender() );
- menu->addAction( i18n( "&Copy" ), this, SLOT( copyToClipboard() ), QKeySequence( \
Qt::Key_C | Qt::CTRL ) ); + menu->addAction( i18n( "&Copy" ), this, \
SLOT(copyToClipboard()), QKeySequence( Qt::Key_C | Qt::CTRL ) ); menu->exec( \
event->globalPos() ); }
diff --git a/src/tools/moleculeview.cpp b/src/tools/moleculeview.cpp
index 278132c..c9fa9f4 100644
--- a/src/tools/moleculeview.cpp
+++ b/src/tools/moleculeview.cpp
@@ -98,14 +98,14 @@ MoleculeDialog::MoleculeDialog( QWidget * parent )
this, SLOT(setViewEdit(int)));
// Visualization parameters
- connect(ui.qualityCombo, SIGNAL(activated( int )),
- ui.glWidget , SLOT( setQuality( int ) ) );
- connect(ui.styleCombo, SIGNAL(activated( int )),
- ui.glWidget , SLOT( setStyle( int ) ) );
- connect(ui.style2Combo, SIGNAL(activated( int )),
- ui.glWidget , SLOT( setStyle2( int ) ) );
- connect(ui.labelsCombo, SIGNAL(activated( int )),
- ui.glWidget , SLOT( setLabels( int ) ) );
+ connect(ui.qualityCombo, SIGNAL(activated(int)),
+ ui.glWidget , SLOT(setQuality(int)) );
+ connect(ui.styleCombo, SIGNAL(activated(int)),
+ ui.glWidget , SLOT(setStyle(int)) );
+ connect(ui.style2Combo, SIGNAL(activated(int)),
+ ui.glWidget , SLOT(setStyle2(int)) );
+ connect(ui.labelsCombo, SIGNAL(activated(int)),
+ ui.glWidget , SLOT(setLabels(int)) );
// Editing parameters
connect(ui.elementCombo, SIGNAL(currentIndexChanged(int)),
@@ -122,12 +122,12 @@ MoleculeDialog::MoleculeDialog( QWidget * parent )
connect(ui.glWidget->molecule(), SIGNAL(updated()),
this, SLOT(slotUpdateStatistics()));
- connect(this, SIGNAL( user1Clicked() ),
- this, SLOT( slotLoadMolecule() ) );
- connect(this, SIGNAL( user2Clicked() ),
- this, SLOT( slotDownloadNewStuff() ) );
- connect(this, SIGNAL( user3Clicked() ),
- this, SLOT( slotSaveMolecule() ) );
+ connect(this, SIGNAL(user1Clicked()),
+ this, SLOT(slotLoadMolecule()) );
+ connect(this, SIGNAL(user2Clicked()),
+ this, SLOT(slotDownloadNewStuff()) );
+ connect(this, SIGNAL(user3Clicked()),
+ this, SLOT(slotSaveMolecule()) );
// Check that we have managed to load up some tools and engines
int nEngines = ui.glWidget->engines().size() - 1;
diff --git a/src/tools/obconverter.cpp b/src/tools/obconverter.cpp
index 93f4ae1..4f32302 100644
--- a/src/tools/obconverter.cpp
+++ b/src/tools/obconverter.cpp
@@ -80,19 +80,19 @@ void KOpenBabel::setupWindow()
// Create connection
connect(ui.addFileButton,
- SIGNAL( clicked() ), SLOT( slotAddFile() ));
+ SIGNAL(clicked()), SLOT(slotAddFile()));
connect(ui.deleteFileButton,
- SIGNAL( clicked() ), SLOT( slotDeleteFile() ));
+ SIGNAL(clicked()), SLOT(slotDeleteFile()));
connect(ui.selectAllFileButton,
- SIGNAL( clicked() ), SLOT( slotSelectAll() ));
+ SIGNAL(clicked()), SLOT(slotSelectAll()));
connect(this,
- SIGNAL( user1Clicked() ), SLOT( slotConvert() ));
+ SIGNAL(user1Clicked()), SLOT(slotConvert()));
connect(ui.FileListView,
- SIGNAL( itemSelectionChanged() ), SLOT( slotGuessInput() ));
+ SIGNAL(itemSelectionChanged()), SLOT(slotGuessInput()));
}
void KOpenBabel::slotAddFile()
diff --git a/src/unitsettingsdialog.cpp b/src/unitsettingsdialog.cpp
index 49f0235..b9e5fe7 100644
--- a/src/unitsettingsdialog.cpp
+++ b/src/unitsettingsdialog.cpp
@@ -81,4 +81,5 @@ UnitSettingsDialog::~UnitSettingsDialog()
delete m_comboBoxLEnergiesUnit;
delete m_comboBoxLengthUnit;
delete m_comboBoxLTemperatureUnit;
-}
\ No newline at end of file
+}
+
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic