[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [step] /: Fix minor EBN issues and minor porting for KStandardDirs, KInputDialog and writeConfig
From: Yuri Chornoivan <null () kde ! org>
Date: 2018-09-23 18:01:45
Message-ID: E1g48hV-0005d6-PN () code ! kde ! org
[Download RAW message or body]
Git commit f6ae93b601982c4a22ce089be7553af45dc70da0 by Yuri Chornoivan.
Committed on 23/09/2018 at 18:01.
Pushed by yurchor into branch 'master'.
Fix minor EBN issues and minor porting for KStandardDirs, KInputDialog and \
writeConfig
M +1 -1 doc/CMakeLists.txt
M +2 -2 step/gasgraphics.cc
M +5 -5 step/infobrowser.cc
M +1 -1 step/itempalette.cc
M +17 -17 step/mainwindow.cc
M +2 -2 step/messageframe.cc
M +13 -13 step/propertiesbrowser.cc
M +16 -16 step/toolgraphics.cc
M +15 -15 step/worldscene.cc
https://commits.kde.org/step/f6ae93b601982c4a22ce089be7553af45dc70da0
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 8ed61f8..e587589 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
########### install files ###############
#
#kde4_create_handbook(index.docbook INSTALL_DESTINATION \
${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR step)
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION \
${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR step) \ No newline at end of file
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION \
${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR step)
diff --git a/step/gasgraphics.cc b/step/gasgraphics.cc
index 5575b57..df20374 100644
--- a/step/gasgraphics.cc
+++ b/step/gasgraphics.cc
@@ -323,9 +323,9 @@ void GasMenuHandler::createGasParticles()
_createGasParticlesUi->labelTemperature->setText(gas()->metaObject()->property("rectTemperature")->units());
_createGasParticlesUi->labelMeanVelocity->setText(gas()->metaObject()->property("rectMeanVelocity")->units());
- connect(_createGasParticlesUi->lineEditCount, SIGNAL(textEdited(const \
QString&)), + connect(_createGasParticlesUi->lineEditCount, \
SIGNAL(textEdited(QString)), this, SLOT(createGasParticlesCountChanged()));
- connect(_createGasParticlesUi->lineEditConcentration, SIGNAL(textEdited(const \
QString&)), + connect(_createGasParticlesUi->lineEditConcentration, \
SIGNAL(textEdited(QString)), this, SLOT(createGasParticlesConcentrationChanged()));
int retval = _creationDialog->exec();
diff --git a/step/infobrowser.cc b/step/infobrowser.cc
index b0b325b..899ef1a 100644
--- a/step/infobrowser.cc
+++ b/step/infobrowser.cc
@@ -80,11 +80,11 @@ InfoBrowser::InfoBrowser(WorldModel* worldModel, QWidget* parent, \
Qt::WindowFlag _htmlPart->setDNDEnabled(false);
connect(_htmlPart->browserExtension(),
- SIGNAL(openUrlRequest(const QUrl&, const KParts::OpenUrlArguments&, const \
KParts::BrowserArguments&)),
- this, SLOT(openUrl(const QUrl&)));
+ SIGNAL(openUrlRequest(QUrl,KParts::OpenUrlArguments,KParts::BrowserArguments)),
+ this, SLOT(openUrl(QUrl)));
- connect(_worldModel->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, \
const QModelIndex&)),
- this, SLOT(worldCurrentChanged(const \
QModelIndex&, const QModelIndex&))); + connect(_worldModel->selectionModel(), \
SIGNAL(currentChanged(QModelIndex,QModelIndex)), + \
this, SLOT(worldCurrentChanged(QModelIndex,QModelIndex)));
syncSelection();
}
@@ -210,7 +210,7 @@ void InfoBrowser::openUrl(const QUrl& url, bool clearHistory, \
bool fromHistory) _wikiUrl = url;
_wikiFromHistory = fromHistory;
_wikiJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
- connect(_wikiJob, SIGNAL(result(KJob*)), this, SLOT( \
wikiResult(KJob*))); + connect(_wikiJob, SIGNAL(result(KJob*)), this, \
SLOT(wikiResult(KJob*))); } else {
QDesktopServices::openUrl(url);
}
diff --git a/step/itempalette.cc b/step/itempalette.cc
index 413a115..4fc0890 100644
--- a/step/itempalette.cc
+++ b/step/itempalette.cc
@@ -277,7 +277,7 @@ void ItemPalette::createObjectAction(const StepCore::MetaObject* \
metaObject) void ItemPalette::showButtonTextToggled(bool b)
{
Settings::setShowButtonText(b);
- Settings::self()->writeConfig();
+ Settings::self()->save();
foreach(QToolButton* button, _toolButtons) {
button->setToolButtonStyle(b ? Qt::ToolButtonTextBesideIcon :
Qt::ToolButtonIconOnly);
diff --git a/step/mainwindow.cc b/step/mainwindow.cc
index 83ef7fc..bbb0a58 100644
--- a/step/mainwindow.cc
+++ b/step/mainwindow.cc
@@ -40,7 +40,6 @@
#include <KMessageBox>
#include <KFileDialog>
#include <KConfigDialog>
-#include <KStandardDirs>
#include <KStatusBar>
#include <KLocalizedString>
#include <KConfig>
@@ -50,6 +49,7 @@
#include <knewstuff3/downloaddialog.h>
#include <QAction>
+#include <QDir>
#include <QTemporaryFile>
#include <QIcon>
#include <QItemSelectionModel>
@@ -105,15 +105,15 @@ MainWindow::MainWindow()
setCentralWidget(worldGraphicsView);
connect(worldModel, SIGNAL(simulationStopped(int)), this, \
SLOT(simulationStopped(int)));
- connect(worldModel->selectionModel(), SIGNAL(selectionChanged(const \
QItemSelection&, const QItemSelection&)), + connect(worldModel->selectionModel(), \
SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, \
SLOT(worldSelectionChanged()));
- connect(itemPalette, SIGNAL(beginAddItem(const QString&)),
- worldScene, SLOT(beginAddItem(const QString&)));
- connect(worldScene, SIGNAL(endAddItem(const QString&, bool)),
- itemPalette, SLOT(endAddItem(const QString&, bool)));
- connect(worldScene, SIGNAL(linkActivated(const QUrl&)),
- infoBrowser, SLOT(openUrl(const QUrl&)));
- connect(worldScene, SIGNAL(endAddItem(QString, bool)),
+ connect(itemPalette, SIGNAL(beginAddItem(QString)),
+ worldScene, SLOT(beginAddItem(QString)));
+ connect(worldScene, SIGNAL(endAddItem(QString,bool)),
+ itemPalette, SLOT(endAddItem(QString,bool)));
+ connect(worldScene, SIGNAL(linkActivated(QUrl)),
+ infoBrowser, SLOT(openUrl(QUrl)));
+ connect(worldScene, SIGNAL(endAddItem(QString,bool)),
this, SLOT(worldSelectionChanged()));
@@ -139,7 +139,7 @@ void MainWindow::setupActions()
KStandardAction::save(this, SLOT(saveFile()), actionCollection());
KStandardAction::saveAs(this, SLOT(saveFileAs()), actionCollection());
KStandardAction::quit(this, SLOT(close()), actionCollection());
- actionRecentFiles = KStandardAction::openRecent(this, SLOT(openFile(const \
QUrl&)), + actionRecentFiles = KStandardAction::openRecent(this, \
SLOT(openFile(QUrl)), actionCollection());
KConfig* config = new KConfig("steprc");
@@ -179,10 +179,10 @@ void MainWindow::setupActions()
connect(worldModel->undoStack(), SIGNAL(canRedoChanged(bool)), actionRedo, \
SLOT(setEnabled(bool)));
connect(worldModel->undoStack(), SIGNAL(canUndoChanged(bool)), actionUndo, \
SLOT(setEnabled(bool)));
connect(worldModel->undoStack(), SIGNAL(cleanChanged(bool)), this, \
SLOT(updateCaption()));
- connect(worldModel->undoStack(), SIGNAL(undoTextChanged(const QString&)),
- this, SLOT(undoTextChanged(const QString&)));
- connect(worldModel->undoStack(), SIGNAL(redoTextChanged(const QString&)),
- this, SLOT(redoTextChanged(const QString&)));
+ connect(worldModel->undoStack(), SIGNAL(undoTextChanged(QString)),
+ this, SLOT(undoTextChanged(QString)));
+ connect(worldModel->undoStack(), SIGNAL(redoTextChanged(QString)),
+ this, SLOT(redoTextChanged(QString)));
actionCut = KStandardAction::cut(worldModel, SLOT(cutSelectedItems()),
actionCollection());
@@ -464,7 +464,7 @@ void MainWindow::openLocalExample()
// XXX: need to be redone
QString dir = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + \
"/examples"; if(dir.isEmpty()) return;
- KStandardDirs::makeDir(dir);
+ QDir::root().mkpath(dir);
openFile(QUrl(), QUrl::fromLocalFile(dir));
}
@@ -602,9 +602,9 @@ void MainWindow::configureStep()
generalUi.setupUi(generalWidget);
dialog->addPage(generalWidget, i18n("General"), "step"); //shows the "step" \
icon, the "general" icon doesn't exist
- connect(dialog, SIGNAL(settingsChanged(const QString&)),
+ connect(dialog, SIGNAL(settingsChanged(QString)),
worldGraphicsView, SLOT(settingsChanged()));
- connect(dialog, SIGNAL(settingsChanged(const QString&)),
+ connect(dialog, SIGNAL(settingsChanged(QString)),
propertiesBrowser, SLOT(settingsChanged()));
dialog->show();
diff --git a/step/messageframe.cc b/step/messageframe.cc
index f5c83e6..22c71a1 100644
--- a/step/messageframe.cc
+++ b/step/messageframe.cc
@@ -79,8 +79,8 @@ int MessageFrame::showMessage(Type type, const QString& text, Flags \
flags) textLabel->setText(text);
layout->addWidget(textLabel, 1);
- connect(textLabel, SIGNAL(linkActivated(const QString&)),
- this, SLOT(messageLinkActivated(const QString&)));
+ connect(textLabel, SIGNAL(linkActivated(QString)),
+ this, SLOT(messageLinkActivated(QString)));
if(flags.testFlag(CloseButton)) {
QToolButton* button = new QToolButton(widget);
diff --git a/step/propertiesbrowser.cc b/step/propertiesbrowser.cc
index 235f6eb..dee2fee 100644
--- a/step/propertiesbrowser.cc
+++ b/step/propertiesbrowser.cc
@@ -504,7 +504,7 @@ QWidget* PropertiesBrowserDelegate::createEditor(QWidget* parent,
// XXX: do not use hard-coded pixel sizes
colorButton->setMinimumWidth(15);
colorButton->setMaximumWidth(15);
- connect(colorButton, SIGNAL(changed(const QColor&)), this, \
SLOT(editorActivated())); + connect(colorButton, SIGNAL(changed(QColor)), \
this, SLOT(editorActivated()));
QHBoxLayout* layout = new QHBoxLayout(editor);
layout->setContentsMargins(0,0,0,0);
@@ -689,22 +689,22 @@ PropertiesBrowser::PropertiesBrowser(WorldModel* worldModel, \
QWidget* parent, Qt
connect(_worldModel, SIGNAL(modelReset()), this, SLOT(worldModelReset()));
connect(_worldModel, SIGNAL(worldDataChanged(bool)), this, \
SLOT(worldDataChanged(bool)));
- connect(_worldModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
- this, SLOT(worldRowsRemoved(const QModelIndex&, int, \
int))); + connect(_worldModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(worldRowsRemoved(QModelIndex,int,int)));
- connect(_worldModel->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, \
const QModelIndex&)),
- this, SLOT(worldCurrentChanged(const \
QModelIndex&, const QModelIndex&))); + connect(_worldModel->selectionModel(), \
SIGNAL(currentChanged(QModelIndex,QModelIndex)), + \
this, SLOT(worldCurrentChanged(QModelIndex,QModelIndex)));
- connect(_treeView->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, \
const QModelIndex&)),
- this, SLOT(currentChanged(const \
QModelIndex&, const QModelIndex&))); + connect(_treeView->selectionModel(), \
SIGNAL(currentChanged(QModelIndex,QModelIndex)), + \
this, SLOT(currentChanged(QModelIndex,QModelIndex)));
- //connect(_treeView, SIGNAL(doubleClicked(const QModelIndex&)),
- // this, SLOT(doubleClicked(const \
QModelIndex&))); + //connect(_treeView, SIGNAL(doubleClicked(QModelIndex)),
+ // this, \
SLOT(doubleClicked(QModelIndex)));
- connect(_propertiesBrowserModel, SIGNAL(rowsInserted(const QModelIndex&, int, \
int)),
- this, SLOT(rowsInserted(const \
QModelIndex&, int, int)));
- connect(_propertiesBrowserModel, SIGNAL(rowsRemoved(const QModelIndex&, int, \
int)),
- this, SLOT(rowsRemoved(const \
QModelIndex&, int, int))); + connect(_propertiesBrowserModel, \
SIGNAL(rowsInserted(QModelIndex,int,int)), + \
this, SLOT(rowsInserted(QModelIndex,int,int))); + connect(_propertiesBrowserModel, \
SIGNAL(rowsRemoved(QModelIndex,int,int)), + \
this, SLOT(rowsRemoved(QModelIndex,int,int)));
_treeView->viewport()->installEventFilter(this);
//_treeView->setMouseTracking(true);
diff --git a/step/toolgraphics.cc b/step/toolgraphics.cc
index 1aa90af..18c6ae9 100644
--- a/step/toolgraphics.cc
+++ b/step/toolgraphics.cc
@@ -54,6 +54,7 @@
#include <QAbstractButton>
#include <QPushButton>
#include <QVBoxLayout>
+#include <QInputDialog>
#include <KToolBar>
#include <KPlotWidget>
@@ -68,7 +69,6 @@
#include <KColorDialog>
#include <KLocalizedString>
#include <KMessageBox>
-#include <KInputDialog>
#include <KIO/NetAccess>
#include <float.h>
@@ -428,13 +428,13 @@ NoteGraphicsItem::NoteGraphicsItem(StepCore::Item* item, \
WorldModel* worldModel)
connect(_actionItalic, SIGNAL(triggered(bool)), _textEdit, \
SLOT(setFontItalic(bool)));
connect(_actionUnderline, SIGNAL(triggered(bool)), _textEdit, \
SLOT(setFontUnderline(bool)));
connect(_actionAlign, SIGNAL(triggered(QAction*)), this, \
SLOT(formatAlign(QAction*)));
- connect(_actionFont, SIGNAL(triggered(const QString&)), this, \
SLOT(formatFontFamily(const QString&))); + connect(_actionFont, \
SIGNAL(triggered(QString)), this, SLOT(formatFontFamily(QString)));
connect(_actionFontSize, SIGNAL(fontSizeChanged(int)), this, \
SLOT(formatFontSize(int)));
connect(_actionInsertImage, SIGNAL(triggered(bool)), this, SLOT(insertImage()));
connect(_actionInsertFormula, SIGNAL(triggered(bool)), this, \
SLOT(insertFormula()));
- connect(_textEdit, SIGNAL(currentCharFormatChanged(const QTextCharFormat&)),
- this, SLOT(currentCharFormatChanged(const \
QTextCharFormat&))); + connect(_textEdit, \
SIGNAL(currentCharFormatChanged(QTextCharFormat)), + this, \
SLOT(currentCharFormatChanged(QTextCharFormat)));
connect(_textEdit, SIGNAL(cursorPositionChanged()), this, \
SLOT(cursorPositionChanged()));
@@ -709,8 +709,8 @@ bool NoteGraphicsItem::editFormula(StepCore::NoteFormula* \
formula) }
bool ok;
- QString code = KInputDialog::getMultiLineText(i18n("LaTex Formula - Step"),
- i18n("Enter LaTeX formula string"), QString(formula->code()), &ok, \
_widget); + QString code = QInputDialog::getMultiLineText(_widget, i18n("LaTex \
Formula - Step"), + i18n("Enter LaTeX formula string"), \
QString(formula->code()), &ok); if(!ok) return false;
QByteArray image;
@@ -1158,10 +1158,10 @@ void GraphMenuHandler::configureGraph()
connect(_confUi->dataSourceY, SIGNAL(dataSourceChanged()), this, \
SLOT(confChanged()));
connect(_confUi->checkBoxAutoX, SIGNAL(stateChanged(int)), this, \
SLOT(confChanged()));
connect(_confUi->checkBoxAutoY, SIGNAL(stateChanged(int)), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditMinX, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditMaxX, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditMinY, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditMaxY, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged())); + connect(_confUi->lineEditMinX, \
SIGNAL(textEdited(QString)), this, SLOT(confChanged())); + \
connect(_confUi->lineEditMaxX, SIGNAL(textEdited(QString)), this, \
SLOT(confChanged())); + connect(_confUi->lineEditMinY, \
SIGNAL(textEdited(QString)), this, SLOT(confChanged())); + \
connect(_confUi->lineEditMaxY, SIGNAL(textEdited(QString)), this, \
SLOT(confChanged()));
connect(_confUi->checkBoxShowLines, SIGNAL(stateChanged(int)), this, \
SLOT(confChanged()));
connect(_confUi->checkBoxShowPoints, SIGNAL(stateChanged(int)), this, \
SLOT(confChanged()));
@@ -1362,7 +1362,7 @@ void MeterMenuHandler::configureMeter()
connect(_buttonBox, SIGNAL(clicked(QAbstractButton*)), this, \
SLOT(confApply(QAbstractButton*)));
connect(_confUi->dataSource, SIGNAL(dataSourceChanged()), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditDigits, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged())); + connect(_confUi->lineEditDigits, \
SIGNAL(textEdited(QString)), this, SLOT(confChanged()));
_confDialog->exec();
@@ -1696,11 +1696,11 @@ void ControllerMenuHandler::configureController()
connect(_buttonBox, SIGNAL(clicked(QAbstractButton*)), this, \
SLOT(confApply(QAbstractButton*)));
connect(_confUi->dataSource, SIGNAL(dataSourceChanged()), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditMin, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged()));
- connect(_confUi->lineEditMax, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged()));
- connect(_confUi->keyIncrease, SIGNAL(keySequenceChanged(const QKeySequence&)), \
this, SLOT(confChanged()));
- connect(_confUi->keyDecrease, SIGNAL(keySequenceChanged(const QKeySequence&)), \
this, SLOT(confChanged()));
- connect(_confUi->lineEditIncrement, SIGNAL(textEdited(const QString&)), this, \
SLOT(confChanged())); + connect(_confUi->lineEditMin, SIGNAL(textEdited(QString)), \
this, SLOT(confChanged())); + connect(_confUi->lineEditMax, \
SIGNAL(textEdited(QString)), this, SLOT(confChanged())); + \
connect(_confUi->keyIncrease, SIGNAL(keySequenceChanged(QKeySequence)), this, \
SLOT(confChanged())); + connect(_confUi->keyDecrease, \
SIGNAL(keySequenceChanged(QKeySequence)), this, SLOT(confChanged())); + \
connect(_confUi->lineEditIncrement, SIGNAL(textEdited(QString)), this, \
SLOT(confChanged()));
_confDialog->exec();
diff --git a/step/worldscene.cc b/step/worldscene.cc
index d2cc94d..bc69a9e 100644
--- a/step/worldscene.cc
+++ b/step/worldscene.cc
@@ -16,12 +16,12 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "worldscene.h"
+
#ifdef _WIN32
#include <windows.h>
#endif
-#include "worldscene.h"
-
#include "settings.h"
#include "arrow.h"
@@ -151,17 +151,17 @@ WorldScene::WorldScene(WorldModel* worldModel, QObject* parent)
connect(_worldModel, SIGNAL(modelReset()), this, SLOT(worldModelReset()));
connect(_worldModel, SIGNAL(worldDataChanged(bool)), this, \
SLOT(worldDataChanged(bool)));
- connect(_worldModel->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, \
const QModelIndex&)),
- this, SLOT(worldCurrentChanged(const QModelIndex&, \
const QModelIndex&)));
- connect(_worldModel->selectionModel(), SIGNAL(selectionChanged(const \
QItemSelection&, const QItemSelection&)),
- this, SLOT(worldSelectionChanged(const \
QItemSelection&, const QItemSelection&)));
- connect(_worldModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
- this, SLOT(worldRowsInserted(const QModelIndex&, int, int)));
- connect(_worldModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex&, int, int)),
- this, SLOT(worldRowsAboutToBeRemoved(const QModelIndex&, \
int, int)));
-
- connect(_messageFrame, SIGNAL(linkActivated(const QString&)),
- this, SLOT(messageLinkActivated(const QString&)));
+ connect(_worldModel->selectionModel(), \
SIGNAL(currentChanged(QModelIndex,QModelIndex)), + \
this, SLOT(worldCurrentChanged(QModelIndex,QModelIndex))); + \
connect(_worldModel->selectionModel(), \
SIGNAL(selectionChanged(QItemSelection,QItemSelection)), + \
this, SLOT(worldSelectionChanged(QItemSelection,QItemSelection))); + \
connect(_worldModel, SIGNAL(rowsInserted(QModelIndex,int,int)), + \
this, SLOT(worldRowsInserted(QModelIndex,int,int))); + connect(_worldModel, \
SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + this, \
SLOT(worldRowsAboutToBeRemoved(QModelIndex,int,int))); +
+ connect(_messageFrame, SIGNAL(linkActivated(QString)),
+ this, SLOT(messageLinkActivated(QString)));
connect(_snapTimer, SIGNAL(timeout()), this, SLOT(snapUpdateToolTip()));
}
@@ -573,8 +573,8 @@ WorldGraphicsView::WorldGraphicsView(WorldScene* worldScene, \
QWidget* parent)
_sceneRect = worldScene->sceneRect();
updateSceneRect();
- connect(worldScene, SIGNAL(sceneRectChanged(const QRectF&)),
- this, SLOT(sceneRectChanged(const QRectF&)));
+ connect(worldScene, SIGNAL(sceneRectChanged(QRectF)),
+ this, SLOT(sceneRectChanged(QRectF)));
//worldGraphicsView->setRenderHints(QPainter::Antialiasing);
setDragMode(QGraphicsView::RubberBandDrag);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic