[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [labplot/frameworks] src: Removing deprecated functions and warnings except kdialog
From: Alexander Semke <alexander.semke () web ! de>
Date: 2015-02-28 22:03:03
Message-ID: E1YRpTT-0000jP-JG () scm ! kde ! org
[Download RAW message or body]
Git commit 4e2e416ff3d2a63a68a76d2c4d8e5625591b36b0 by Alexander Semke, on behalf of \
Garvit Khatri. Committed on 23/02/2015 at 17:45.
Pushed by asemke into branch 'frameworks'.
Removing deprecated functions and warnings except kdialog
M +6 -6 src/backend/core/AbstractAspect.cpp
M +2 -2 src/backend/core/Folder.cpp
M +2 -2 src/backend/datasources/FileDataSource.cpp
M +2 -2 src/backend/spreadsheet/Spreadsheet.cpp
M +2 -2 src/backend/worksheet/TextLabel.cpp
M +2 -2 src/backend/worksheet/Worksheet.cpp
M +3 -3 src/backend/worksheet/plots/cartesian/Axis.cpp
M +22 -22 src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
M +1 -1 src/backend/worksheet/plots/cartesian/CartesianPlotLegend.cpp
M +1 -1 src/backend/worksheet/plots/cartesian/XYCurve.cpp
M +1 -1 src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp
M +1 -1 src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
M +4 -4 src/commonfrontend/ProjectExplorer.cpp
M +9 -9 src/kdefrontend/HistoryDialog.cpp
M +5 -5 src/kdefrontend/LabPlot.cpp
M +2 -2 src/kdefrontend/MainWin.cpp
M +5 -5 src/kdefrontend/TemplateHandler.cpp
M +2 -2 src/kdefrontend/spreadsheet/RandomValuesDialog.cpp
M +4 -4 src/kdefrontend/spreadsheet/SortDialog.cpp
M +1 -8 src/kdefrontend/ui/datasources/asciioptionswidget.ui
M +1 -8 src/kdefrontend/ui/datasources/binaryoptionswidget.ui
M +15 -25 src/kdefrontend/ui/dockwidgets/cartesianplotdock.ui
M +2 -2 src/kdefrontend/widgets/LabelWidget.cpp
M +2 -2 src/kdefrontend/widgets/LabelWidget.h
M +6 -6 src/tools/TeXRenderer.cpp
http://commits.kde.org/labplot/4e2e416ff3d2a63a68a76d2c4d8e5625591b36b0
diff --git a/src/backend/core/AbstractAspect.cpp \
b/src/backend/core/AbstractAspect.cpp index 56d2e03..fc7cfc3 100644
--- a/src/backend/core/AbstractAspect.cpp
+++ b/src/backend/core/AbstractAspect.cpp
@@ -42,10 +42,10 @@
#include <QXmlStreamWriter>
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
-#include <KIcon>
+#include <QIcon>
#include <KAction>
#include <KStandardAction>
-#include <KMenu>
+#include <QMenu>
#endif
/**
* \class AbstractAspect
@@ -312,15 +312,15 @@ QMenu* AbstractAspect::createContextMenu() {
action->setIcon(widget_style->standardIcon(QStyle::SP_TrashIcon));
return menu;
#else
- KMenu* menu = new KMenu();
- menu->addTitle(this->name());
+ QMenu* menu = new QMenu();
+ menu->addSection(this->name());
//TODO: activate this again when the functionality is implemented
// menu->addAction( KStandardAction::cut(this) );
// menu->addAction(KStandardAction::copy(this));
// menu->addAction(KStandardAction::paste(this));
// menu->addSeparator();
- menu->addAction(QIcon(KIcon("edit-rename")), i18n("Rename"), this, \
SIGNAL(renameRequested()));
- menu->addAction(QIcon(KIcon("edit-delete")), i18n("Delete"), this, SLOT(remove()));
+ menu->addAction(QIcon(QIcon("edit-rename")), i18n("Rename"), this, \
SIGNAL(renameRequested())); + menu->addAction(QIcon(QIcon("edit-delete")), \
i18n("Delete"), this, SLOT(remove())); return menu;
#endif
}
diff --git a/src/backend/core/Folder.cpp b/src/backend/core/Folder.cpp
index 7187dc9..915f0fb 100644
--- a/src/backend/core/Folder.cpp
+++ b/src/backend/core/Folder.cpp
@@ -42,7 +42,7 @@
#include <QIcon>
#include "core/plugin/PluginManager.h"
#else
-#include <KIcon>
+#include <QIcon>
#include <klocalizedstring.h>
#endif
@@ -62,7 +62,7 @@ QIcon Folder::icon() const
result.addFile(":/folder_closed.xpm", QSize(), QIcon::Normal, QIcon::Off);
result.addFile(":/folder_open.xpm", QSize(), QIcon::Normal, QIcon::On);
#else
- result=KIcon("folder");
+ result=QIcon("folder");
#endif
return result;
}
diff --git a/src/backend/datasources/FileDataSource.cpp \
b/src/backend/datasources/FileDataSource.cpp index 703fabe..cf7f2f4 100644
--- a/src/backend/datasources/FileDataSource.cpp
+++ b/src/backend/datasources/FileDataSource.cpp
@@ -44,7 +44,7 @@ Email (use @ for *) : alexander.semke*web.de
#include <QIcon>
#include <QAction>
#else
-#include <KIcon>
+#include <QIcon>
#include <KAction>
#include <KLocale>
#endif
@@ -77,7 +77,7 @@ FileDataSource::~FileDataSource(){
}
void FileDataSource::initActions(){
- m_reloadAction = new QAction(KIcon("view-refresh"), i18n("Reload"), this);
+ m_reloadAction = new QAction(QIcon("view-refresh"), i18n("Reload"), this);
connect(m_reloadAction, SIGNAL(triggered()), this, SLOT(read()));
m_toggleWatchAction = new QAction(i18n("Watch the file"), this);
diff --git a/src/backend/spreadsheet/Spreadsheet.cpp \
b/src/backend/spreadsheet/Spreadsheet.cpp index 98445ab..b2a702b 100644
--- a/src/backend/spreadsheet/Spreadsheet.cpp
+++ b/src/backend/spreadsheet/Spreadsheet.cpp
@@ -36,7 +36,7 @@
#include "backend/lib/macros.h"
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
-#include <KIcon>
+#include <QIcon>
#include <KConfig>
#include <KConfigGroup>
#include <KLocale>
@@ -614,7 +614,7 @@ void Spreadsheet::sortColumns(Column *leading, QList<Column*> \
cols, bool ascendi Returns an icon to be used for decorating my views.
*/
QIcon Spreadsheet::icon() const {
- return KIcon("table"); //or KIcon("x-office-spreadsheet")
+ return QIcon("table"); //or QIcon("x-office-spreadsheet")
}
/*!
diff --git a/src/backend/worksheet/TextLabel.cpp \
b/src/backend/worksheet/TextLabel.cpp index ab9dafa..d685db2 100644
--- a/src/backend/worksheet/TextLabel.cpp
+++ b/src/backend/worksheet/TextLabel.cpp
@@ -40,7 +40,7 @@
#include <QGraphicsSceneMouseEvent>
#include <QMenu>
-#include <KIcon>
+#include <QIcon>
#include <KConfig>
#include <KConfigGroup>
#include <KLocale>
@@ -159,7 +159,7 @@ void TextLabel::handlePageResize(double horizontalRatio, double \
verticalRatio){ Returns an icon to be used in the project explorer.
*/
QIcon TextLabel::icon() const{
- return KIcon("draw-text");
+ return QIcon("draw-text");
}
QMenu* TextLabel::createContextMenu(){
diff --git a/src/backend/worksheet/Worksheet.cpp \
b/src/backend/worksheet/Worksheet.cpp index fd1e0c7..cb5c72d 100644
--- a/src/backend/worksheet/Worksheet.cpp
+++ b/src/backend/worksheet/Worksheet.cpp
@@ -40,7 +40,7 @@
#include <QGraphicsScene>
#include <QWidget>
#include <QDebug>
-#include "KIcon"
+#include "QIcon"
#include <KConfig>
#include <KConfigGroup>
#include <KLocale>
@@ -140,7 +140,7 @@ float Worksheet::convertFromSceneUnits(const float value, const \
Worksheet::Unit
//! Return an icon to be used for decorating my views.
QIcon Worksheet::icon() const {
- return KIcon("office-chart-area");
+ return QIcon("office-chart-area");
}
//! Return a new context menu.
diff --git a/src/backend/worksheet/plots/cartesian/Axis.cpp \
b/src/backend/worksheet/plots/cartesian/Axis.cpp index 3056fbb..6959da9 100644
--- a/src/backend/worksheet/plots/cartesian/Axis.cpp
+++ b/src/backend/worksheet/plots/cartesian/Axis.cpp
@@ -48,7 +48,7 @@
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
#include "kdefrontend/GuiTools.h"
#include <KConfigGroup>
-#include <KIcon>
+#include <QIcon>
#include <KLocale>
#endif
@@ -247,9 +247,9 @@ QIcon Axis::icon() const{
QIcon ico;
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
if (d->orientation == Axis::AxisHorizontal)
- ico = KIcon("axis-horizontal");
+ ico = QIcon("axis-horizontal");
else
- ico = KIcon("axis-vertical");
+ ico = QIcon("axis-vertical");
#endif
return ico;
}
diff --git a/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp \
b/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp index 5a9419c..5b32a32 \
100644
--- a/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
+++ b/src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
@@ -48,8 +48,8 @@
#include <QToolBar>
#include <QPainter>
-#include <KIcon>
-#include <KAction>
+#include <QIcon>
+#include <QAction>
#include <KLocale>
#define SCALE_MIN CartesianCoordinateSystem::Scale::LIMIT_MIN
@@ -341,12 +341,12 @@ void CartesianPlot::initDefault(Type type){
void CartesianPlot::initActions(){
//"add new" actions
- addCurveAction = new KAction(KIcon("xy-curve"), i18n("xy-curve"), this);
- addEquationCurveAction = new KAction(KIcon("xy-equation-curve"), i18n("xy-curve \
from a mathematical equation"), this);
- addFitCurveAction = new KAction(KIcon("xy-fit-curve"), i18n("xy-curve from a fit to \
data"), this);
- addLegendAction = new KAction(KIcon("text-field"), i18n("legend"), this);
- addHorizontalAxisAction = new KAction(KIcon("axis-horizontal"), i18n("horizontal \
axis"), this);
- addVerticalAxisAction = new KAction(KIcon("axis-vertical"), i18n("vertical axis"), \
this); + addCurveAction = new QAction(QIcon("xy-curve"), i18n("xy-curve"), this);
+ addEquationCurveAction = new QAction(QIcon("xy-equation-curve"), i18n("xy-curve \
from a mathematical equation"), this); + addFitCurveAction = new \
QAction(QIcon("xy-fit-curve"), i18n("xy-curve from a fit to data"), this); + \
addLegendAction = new QAction(QIcon("text-field"), i18n("legend"), this); + \
addHorizontalAxisAction = new QAction(QIcon("axis-horizontal"), i18n("horizontal \
axis"), this); + addVerticalAxisAction = new QAction(QIcon("axis-vertical"), \
i18n("vertical axis"), this);
connect(addCurveAction, SIGNAL(triggered()), SLOT(addCurve()));
connect(addEquationCurveAction, SIGNAL(triggered()), SLOT(addEquationCurve()));
@@ -356,19 +356,19 @@ void CartesianPlot::initActions(){
connect(addVerticalAxisAction, SIGNAL(triggered()), SLOT(addVerticalAxis()));
//zoom/navigate actions
- scaleAutoAction = new KAction(KIcon("auto-scale-all"), i18n("auto scale"), this);
- scaleAutoXAction = new KAction(KIcon("auto-scale-x"), i18n("auto scale X"), this);
- scaleAutoYAction = new KAction(KIcon("auto-scale-y"), i18n("auto scale Y"), this);
- zoomInAction = new KAction(KIcon("zoom-in"), i18n("zoom in"), this);
- zoomOutAction = new KAction(KIcon("zoom-out"), i18n("zoom out"), this);
- zoomInXAction = new KAction(KIcon("zoom-in-x"), i18n("zoom in X"), this);
- zoomOutXAction = new KAction(KIcon("zoom-out-x"), i18n("zoom out X"), this);
- zoomInYAction = new KAction(KIcon("zoom-in-y"), i18n("zoom in Y"), this);
- zoomOutYAction = new KAction(KIcon("zoom-out-y"), i18n("zoom out Y"), this);
- shiftLeftXAction = new KAction(KIcon("shift-left-x"), i18n("shift left X"), \
this);
- shiftRightXAction = new KAction(KIcon("shift-right-x"), i18n("shift right X"), \
this);
- shiftUpYAction = new KAction(KIcon("shift-up-y"), i18n("shift up Y"), this);
- shiftDownYAction = new KAction(KIcon("shift-down-y"), i18n("shift down Y"), this);
+ scaleAutoAction = new QAction(QIcon("auto-scale-all"), i18n("auto scale"), \
this); + scaleAutoXAction = new QAction(QIcon("auto-scale-x"), i18n("auto scale \
X"), this); + scaleAutoYAction = new QAction(QIcon("auto-scale-y"), i18n("auto \
scale Y"), this); + zoomInAction = new QAction(QIcon("zoom-in"), i18n("zoom in"), \
this); + zoomOutAction = new QAction(QIcon("zoom-out"), i18n("zoom out"), this);
+ zoomInXAction = new QAction(QIcon("zoom-in-x"), i18n("zoom in X"), this);
+ zoomOutXAction = new QAction(QIcon("zoom-out-x"), i18n("zoom out X"), this);
+ zoomInYAction = new QAction(QIcon("zoom-in-y"), i18n("zoom in Y"), this);
+ zoomOutYAction = new QAction(QIcon("zoom-out-y"), i18n("zoom out Y"), this);
+ shiftLeftXAction = new QAction(QIcon("shift-left-x"), i18n("shift left X"), \
this); + shiftRightXAction = new QAction(QIcon("shift-right-x"), i18n("shift right \
X"), this); + shiftUpYAction = new QAction(QIcon("shift-up-y"), i18n("shift up \
Y"), this); + shiftDownYAction = new QAction(QIcon("shift-down-y"), i18n("shift \
down Y"), this);
connect(scaleAutoAction, SIGNAL(triggered()), SLOT(scaleAuto()));
connect(scaleAutoXAction, SIGNAL(triggered()), SLOT(scaleAutoX()));
@@ -448,7 +448,7 @@ QIcon CartesianPlot::icon() const{
#ifdef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
ico.addPixmap(QPixmap(":/graph.xpm"));
#else
- ico = KIcon("office-chart-line");
+ ico = QIcon("office-chart-line");
#endif
return ico;
}
diff --git a/src/backend/worksheet/plots/cartesian/CartesianPlotLegend.cpp \
b/src/backend/worksheet/plots/cartesian/CartesianPlotLegend.cpp index \
6f0b13e..5b43bbd 100644
--- a/src/backend/worksheet/plots/cartesian/CartesianPlotLegend.cpp
+++ b/src/backend/worksheet/plots/cartesian/CartesianPlotLegend.cpp
@@ -160,7 +160,7 @@ QMenu* CartesianPlotLegend::createContextMenu(){
QIcon CartesianPlotLegend::icon() const{
QIcon icon;
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
- icon = KIcon("text-field");
+ icon = QIcon("text-field");
#endif
return icon;
}
diff --git a/src/backend/worksheet/plots/cartesian/XYCurve.cpp \
b/src/backend/worksheet/plots/cartesian/XYCurve.cpp index 43382a2..3e27d9a 100644
--- a/src/backend/worksheet/plots/cartesian/XYCurve.cpp
+++ b/src/backend/worksheet/plots/cartesian/XYCurve.cpp
@@ -174,7 +174,7 @@ QMenu* XYCurve::createContextMenu(){
QIcon XYCurve::icon() const{
QIcon icon;
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
- icon = KIcon("xy-curve");
+ icon = QIcon("xy-curve");
#endif
return icon;
}
diff --git a/src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp \
b/src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp index 02f7486..388fd7c \
100644
--- a/src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp
+++ b/src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp
@@ -88,7 +88,7 @@ void XYEquationCurve::recalculate() {
Returns an icon to be used in the project explorer.
*/
QIcon XYEquationCurve::icon() const {
- return KIcon("xy-equation-curve");
+ return QIcon("xy-equation-curve");
}
//##############################################################################
diff --git a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp \
b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp index 9852bee..d7f682c 100644
--- a/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
+++ b/src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
@@ -84,7 +84,7 @@ void XYFitCurve::recalculate() {
Returns an icon to be used in the project explorer.
*/
QIcon XYFitCurve::icon() const {
- return KIcon("xy-fit-curve");
+ return QIcon("xy-fit-curve");
}
//##############################################################################
diff --git a/src/commonfrontend/ProjectExplorer.cpp \
b/src/commonfrontend/ProjectExplorer.cpp index b82be85..bff0e98 100644
--- a/src/commonfrontend/ProjectExplorer.cpp
+++ b/src/commonfrontend/ProjectExplorer.cpp
@@ -46,7 +46,7 @@
#include <KLineEdit>
#include <KLocale>
-#include <KMenu>
+#include <QMenu>
/*!
\class ProjectExplorer
@@ -79,7 +79,7 @@ ProjectExplorer::ProjectExplorer(QWidget* parent) {
#else
leFilter= new KLineEdit(frameFilter);
qobject_cast<KLineEdit*>(leFilter)->setClearButtonShown(true);
- qobject_cast<KLineEdit*>(leFilter)->setClickMessage(i18n("Search/Filter text"));
+ qobject_cast<KLineEdit*>(leFilter)->setPlaceholderText(i18n("Search/Filter \
text")); #endif
layoutFilter->addWidget(leFilter);
@@ -255,8 +255,8 @@ bool ProjectExplorer::eventFilter(QObject* obj, QEvent* event){
columnsMenu = new QMenu(h);
//TODO how to add a caption/title for the QMenu, when used as a context menu?
#else
- columnsMenu = new KMenu(h);
- (qobject_cast<KMenu*>(columnsMenu))->addTitle(i18n("Columns"));
+ columnsMenu = new QMenu(h);
+ (qobject_cast<QMenu*>(columnsMenu))->addSection(i18n("Columns"));
#endif
columnsMenu->addAction(showAllColumnsAction);
diff --git a/src/kdefrontend/HistoryDialog.cpp b/src/kdefrontend/HistoryDialog.cpp
index a302f52..cbde53f 100644
--- a/src/kdefrontend/HistoryDialog.cpp
+++ b/src/kdefrontend/HistoryDialog.cpp
@@ -46,21 +46,21 @@ HistoryDialog::HistoryDialog(QWidget* parent, QUndoStack* stack, \
QString& emptyL undoView->setMinimumWidth(350);
undoView->setWhatsThis(i18n("List of all performed steps/actions.\n"
"Select an item in the list to navigate to the corresponding step."));
- setMainWidget(undoView);
+ setMainWidget(undoView);
setWindowIcon( QIcon("view-history") );
setWindowTitle(i18n("Undo/Redo History"));
- showButtonSeparator(true);
+ showButtonSeparator(true);
- if (stack->count()) {
- setButtons( KDialog::Ok | KDialog::User1 | KDialog::Cancel );
- setButtonToolTip(KDialog::User1, i18n("Clears the undo history. Commands are not \
undone or redone; the state of the project remains unchanged.")); + if \
(stack->count()) { + setButtons( KDialog::Ok | KDialog::User1 | \
KDialog::Cancel ); + setButtonToolTip(KDialog::User1, i18n("Clears the undo \
history. Commands are not undone or redone; the state of the project remains \
unchanged.")); setButtonIcon(KDialog::User1, QIcon("edit-clear"));
- setButtonText(KDialog::User1, i18n("Clear"));
- connect(this,SIGNAL(user1Clicked()), this, SLOT(clearUndoStack()));
+ setButtonText(KDialog::User1, i18n("Clear"));
+ connect(this,SIGNAL(user1Clicked()), this, SLOT(clearUndoStack()));
}else{
- setButtons( KDialog::Ok | KDialog::Cancel );
- }
+ setButtons( KDialog::Ok | KDialog::Cancel );
+ }
}
void HistoryDialog::clearUndoStack(){
diff --git a/src/kdefrontend/LabPlot.cpp b/src/kdefrontend/LabPlot.cpp
index fc8cea8..57711f2 100644
--- a/src/kdefrontend/LabPlot.cpp
+++ b/src/kdefrontend/LabPlot.cpp
@@ -30,8 +30,8 @@
#include <QCommandLineParser>
#include <KAboutData>
#include <KLocalizedString>
-#include <KStandardDirs>
-#include <KSplashScreen>
+#include <QStandardPaths>
+#include <QSplashScreen>
#include <QDebug>
#include <KMessageBox>
#include <QFile>
@@ -91,11 +91,11 @@ int main (int argc, char *argv[]) {
}
}
- KSplashScreen *splash=0;
+ QSplashScreen *splash=0;
if (parser.isSet("-splash")) {
- QString file = KStandardDirs::locate("appdata", "splash.png");
+ QString file = QStandardPaths::locate(QStandardPaths::DataLocation, \
"splash.png"); QPixmap pixmap(file);
- splash= new KSplashScreen(pixmap);
+ splash= new QSplashScreen(pixmap);
splash->show();
}
diff --git a/src/kdefrontend/MainWin.cpp b/src/kdefrontend/MainWin.cpp
index 38ba9d0..6efe613 100644
--- a/src/kdefrontend/MainWin.cpp
+++ b/src/kdefrontend/MainWin.cpp
@@ -637,7 +637,7 @@ void MainWin::openProject(const QString& filename) {
return;
}
- QIODevice *file = KFilterDev::deviceForFile(filename,"application/x-gzip",true);
+ QIODevice *file = new \
KCompressionDevice(filename,KFilterDev::compressionTypeForMimeType("application/x-gzip"));
if (file==0)
file = new QFile(filename);
@@ -785,7 +785,7 @@ bool MainWin::saveProjectAs() {
*/
bool MainWin::save(const QString& fileName) {
WAIT_CURSOR;
- QIODevice* file = KFilterDev::deviceForFile(fileName, "application/x-gzip", \
true); + QIODevice* file = new KCompressionDevice(fileName, \
KFilterDev::compressionTypeForMimeType("application/x-gzip")); if (file == 0)
file = new QFile(fileName);
diff --git a/src/kdefrontend/TemplateHandler.cpp \
b/src/kdefrontend/TemplateHandler.cpp index 45db522..5e1c5ba 100644
--- a/src/kdefrontend/TemplateHandler.cpp
+++ b/src/kdefrontend/TemplateHandler.cpp
@@ -37,7 +37,7 @@
#include <KLocalizedString>
#include <KLineEdit>
-#include <KMenu>
+#include <QMenu>
#include <KConfig>
/*!
\class TemplateHandler
@@ -110,8 +110,8 @@ void TemplateHandler::retranslateUi(){
//################################## Slots ####################################
//##############################################################################
void TemplateHandler::loadMenu() {
- KMenu menu;
- menu.addTitle(i18n("Load from"));
+ QMenu menu;
+ menu.addSection(i18n("Load from"));
QStringList list = \
QStandardPaths::locateAll(QStandardPaths::ApplicationsLocation, "templates/" + \
dirNames.at(className) + "/*"); for (int i = 0; i < list.size(); ++i) {
@@ -133,8 +133,8 @@ void TemplateHandler::loadMenuSelected(QAction* action) {
}
void TemplateHandler::saveMenu() {
- KMenu menu;
- menu.addTitle(i18n("Save as"));
+ QMenu menu;
+ menu.addSection(i18n("Save as"));
QStringList list = \
QStandardPaths::locateAll(QStandardPaths::ApplicationsLocation, "templates/"+ \
dirNames.at(className) + "/*"); for (int i = 0; i < list.size(); ++i) {
diff --git a/src/kdefrontend/spreadsheet/RandomValuesDialog.cpp \
b/src/kdefrontend/spreadsheet/RandomValuesDialog.cpp index c0f141d..24d1ff3 100644
--- a/src/kdefrontend/spreadsheet/RandomValuesDialog.cpp
+++ b/src/kdefrontend/spreadsheet/RandomValuesDialog.cpp
@@ -29,7 +29,7 @@
#include "backend/core/column/Column.h"
#include "backend/lib/macros.h"
#include "backend/spreadsheet/Spreadsheet.h"
-#include <KStandardDirs>
+#include <QStandardPaths>
#include <stdio.h>
#include <gsl/gsl_rng.h>
#include <gsl/gsl_randist.h>
@@ -389,7 +389,7 @@ void RandomValuesDialog::distributionChanged(int index) {
ui.kleParameter3->setText("3.0");
}
- QString file = KStandardDirs::locate("data", "LabPlot2/pics/gsl_distributions/" + \
m_formulaPixs[distr] + ".jpg"); + QString file = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"LabPlot2/pics/gsl_distributions/" + m_formulaPixs[distr] + ".jpg"); \
ui.lFuncPic->setPixmap(QPixmap(file)); }
diff --git a/src/kdefrontend/spreadsheet/SortDialog.cpp \
b/src/kdefrontend/spreadsheet/SortDialog.cpp index 6943553..8bfdab8 100644
--- a/src/kdefrontend/spreadsheet/SortDialog.cpp
+++ b/src/kdefrontend/spreadsheet/SortDialog.cpp
@@ -33,7 +33,7 @@
#include <QGroupBox>
#include <QLayout>
#include <KLocale>
-#include <KIcon>
+#include <QIcon>
/*!
@@ -45,7 +45,7 @@
SortDialog::SortDialog( QWidget* parent, Qt::WFlags fl ) : KDialog( parent, fl ){
- setWindowIcon(KIcon("view-sort-ascending"));
+ setWindowIcon(QIcon("view-sort-ascending"));
setWindowTitle(i18n("Sort columns"));
setSizeGripEnabled(true);
@@ -56,8 +56,8 @@ SortDialog::SortDialog( QWidget* parent, Qt::WFlags fl ) : KDialog( \
parent, fl )
layout->addWidget( new QLabel( i18n("Order")), 0, 0 );
cbOrdering = new QComboBox();
- cbOrdering->addItem(KIcon("view-sort-ascending"), i18n("Ascending"));
- cbOrdering->addItem(KIcon("view-sort-descending"), i18n("Descending"));
+ cbOrdering->addItem(QIcon("view-sort-ascending"), i18n("Ascending"));
+ cbOrdering->addItem(QIcon("view-sort-descending"), i18n("Descending"));
layout->addWidget(cbOrdering, 0, 1 );
lblType = new QLabel(i18n("Sort columns"));
diff --git a/src/kdefrontend/ui/datasources/asciioptionswidget.ui \
b/src/kdefrontend/ui/datasources/asciioptionswidget.ui index 1671706..365c405 100644
--- a/src/kdefrontend/ui/datasources/asciioptionswidget.ui
+++ b/src/kdefrontend/ui/datasources/asciioptionswidget.ui
@@ -119,7 +119,7 @@
</widget>
</item>
<item row="7" column="1" colspan="4">
- <widget class="KLineEdit" name="kleVectorNames">
+ <widget class="QLineEdit" name="kleVectorNames">
<property name="enabled">
<bool>false</bool>
</property>
@@ -146,13 +146,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>KLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/src/kdefrontend/ui/datasources/binaryoptionswidget.ui \
b/src/kdefrontend/ui/datasources/binaryoptionswidget.ui index 529a21f..c884b46 100644
--- a/src/kdefrontend/ui/datasources/binaryoptionswidget.ui
+++ b/src/kdefrontend/ui/datasources/binaryoptionswidget.ui
@@ -19,7 +19,7 @@
</widget>
</item>
<item row="0" column="1">
- <widget class="KIntNumInput" name="niVectors">
+ <widget class="QSpinBox" name="niVectors">
<property name="toolTip">
<string>The number of vectors in the file</string>
</property>
@@ -79,13 +79,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KIntNumInput</class>
- <extends>QWidget</extends>
- <header>knuminput.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/src/kdefrontend/ui/dockwidgets/cartesianplotdock.ui \
b/src/kdefrontend/ui/dockwidgets/cartesianplotdock.ui index d762fda..429107e 100644
--- a/src/kdefrontend/ui/dockwidgets/cartesianplotdock.ui
+++ b/src/kdefrontend/ui/dockwidgets/cartesianplotdock.ui
@@ -241,7 +241,7 @@
</item>
<item row="11" column="2">
<widget class="KLineEdit" name="kleXMin">
- <property name="clickMessage">
+ <property name="placeholderText">
<string>Auto</string>
</property>
<property name="showClearButton" stdset="0">
@@ -258,7 +258,7 @@
</item>
<item row="12" column="2">
<widget class="KLineEdit" name="kleXMax">
- <property name="clickMessage">
+ <property name="placeholderText">
<string>Auto</string>
</property>
<property name="showClearButton" stdset="0">
@@ -274,7 +274,7 @@
</widget>
</item>
<item row="13" column="2">
- <widget class="KComboBox" name="cbXScaling"/>
+ <widget class="QComboBox" name="cbXScaling"/>
</item>
<item row="14" column="0">
<spacer name="verticalSpacer_6">
@@ -314,7 +314,7 @@
</item>
<item row="17" column="2">
<widget class="KLineEdit" name="kleYMin">
- <property name="clickMessage">
+ <property name="placeholderText">
<string>Auto</string>
</property>
<property name="showClearButton" stdset="0">
@@ -344,7 +344,7 @@
</item>
<item row="18" column="2">
<widget class="KLineEdit" name="kleYMax">
- <property name="clickMessage">
+ <property name="placeholderText">
<string>Auto</string>
</property>
<property name="showClearButton" stdset="0">
@@ -367,7 +367,7 @@
</widget>
</item>
<item row="19" column="2">
- <widget class="KComboBox" name="cbYScaling"/>
+ <widget class="QComboBox" name="cbYScaling"/>
</item>
<item row="21" column="0">
<widget class="QCheckBox" name="chkVisible">
@@ -459,7 +459,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="cbXBreak">
+ <widget class="QComboBox" name="cbXBreak">
<property name="maximumSize">
<size>
<width>40</width>
@@ -614,7 +614,7 @@
</widget>
</item>
<item>
- <widget class="KComboBox" name="cbYBreak">
+ <widget class="QComboBox" name="cbYBreak">
<property name="maximumSize">
<size>
<width>40</width>
@@ -687,7 +687,7 @@
</widget>
</item>
<item row="11" column="2" colspan="3">
- <widget class="KComboBox" name="cbYBreakStyle"/>
+ <widget class="QComboBox" name="cbYBreakStyle"/>
</item>
<item row="3" column="2" colspan="3">
<widget class="QSpinBox" name="sbXBreakPosition">
@@ -700,7 +700,7 @@
</widget>
</item>
<item row="4" column="2" colspan="3">
- <widget class="KComboBox" name="cbXBreakStyle"/>
+ <widget class="QComboBox" name="cbXBreakStyle"/>
</item>
</layout>
</widget>
@@ -746,7 +746,7 @@
</spacer>
</item>
<item row="1" column="2">
- <widget class="KComboBox" name="cbBackgroundType">
+ <widget class="QComboBox" name="cbBackgroundType">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -796,7 +796,7 @@
</widget>
</item>
<item row="3" column="2">
- <widget class="KComboBox" name="cbBackgroundColorStyle"/>
+ <widget class="QComboBox" name="cbBackgroundColorStyle"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lBackgroundImageStyle">
@@ -806,7 +806,7 @@
</widget>
</item>
<item row="4" column="2">
- <widget class="KComboBox" name="cbBackgroundImageStyle"/>
+ <widget class="QComboBox" name="cbBackgroundImageStyle"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="lBackgroundBrushStyle">
@@ -816,7 +816,7 @@
</widget>
</item>
<item row="5" column="2">
- <widget class="KComboBox" name="cbBackgroundBrushStyle"/>
+ <widget class="QComboBox" name="cbBackgroundBrushStyle"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="lBackgroundFirstColor">
@@ -913,7 +913,7 @@
</widget>
</item>
<item row="11" column="2">
- <widget class="KComboBox" name="cbBorderStyle">
+ <widget class="QComboBox" name="cbBorderStyle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -1111,16 +1111,6 @@
<extends>QPushButton</extends>
<header>kcolorbutton.h</header>
</customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/src/kdefrontend/widgets/LabelWidget.cpp \
b/src/kdefrontend/widgets/LabelWidget.cpp index 328f3bc..05b9392 100644
--- a/src/kdefrontend/widgets/LabelWidget.cpp
+++ b/src/kdefrontend/widgets/LabelWidget.cpp
@@ -35,7 +35,7 @@
#include <KCharSelect>
#include <KLocalizedString>
-#include <KMenu>
+#include <QMenu>
/*!
\class LabelWidget
@@ -48,7 +48,7 @@
*/
// see legacy/LabelWidget.cpp
-LabelWidget::LabelWidget(QWidget *parent): QWidget(parent), m_dateTimeMenu(new \
KMenu(this)) { +LabelWidget::LabelWidget(QWidget *parent): QWidget(parent), \
m_dateTimeMenu(new QMenu(this)) { ui.setupUi(this);
m_dateTimeMenu->setSeparatorsCollapsible(false); //we don't want the first \
separator to be removed
diff --git a/src/kdefrontend/widgets/LabelWidget.h \
b/src/kdefrontend/widgets/LabelWidget.h index 498de33..72bcf09 100644
--- a/src/kdefrontend/widgets/LabelWidget.h
+++ b/src/kdefrontend/widgets/LabelWidget.h
@@ -35,7 +35,7 @@
class Label;
class Axis;
-class KMenu;
+class QMenu;
class LabelWidget: public QWidget{
Q_OBJECT
@@ -59,7 +59,7 @@ private:
QList<TextLabel*> m_labelsList;
QList<Axis*> m_axesList;
bool m_initializing;
- KMenu* m_dateTimeMenu;
+ QMenu* m_dateTimeMenu;
void initConnections();
diff --git a/src/tools/TeXRenderer.cpp b/src/tools/TeXRenderer.cpp
index c00f2a8..7033f73 100644
--- a/src/tools/TeXRenderer.cpp
+++ b/src/tools/TeXRenderer.cpp
@@ -31,7 +31,7 @@
#ifndef ACTIVATE_SCIDAVIS_SPECIFIC_CODE
#include <KTempDir>
#include <KProcess>
-#include <KDebug>
+#include <QDebug>
#endif
#include <QDir>
#include <QTemporaryFile>
@@ -51,7 +51,7 @@ QImage TeXRenderer::renderImageLaTeX( const QString& teXString, \
const QColor& fo QDir::setCurrent("/dev/shm");
}
else {
- kWarning()<<"/dev/shm failed. using /tmp"<<endl;
+ qWarning()<<"/dev/shm failed. using /tmp"<<endl;
file.setFileTemplate("/tmp/labplot_XXXXXX.tex");
if(file.open())
QDir::setCurrent("/tmp");
@@ -116,7 +116,7 @@ QImage TeXRenderer::renderImageLaTeX( const QString& teXString, \
const QColor& fo return QImage();
}
}else{
- kWarning()<<"pdflatex failed."<<endl;
+ qWarning()<<"pdflatex failed."<<endl;
}
//////////// fallback if pdflatex fails ///////////////
@@ -125,7 +125,7 @@ QImage TeXRenderer::renderImageLaTeX( const QString& teXString, \
const QColor& fo latexProcess.start("latex", QStringList() << \
"-interaction=batchmode" << file.fileName()); // also possible: latexmf -C
if (!latexProcess.waitForFinished()) {
- kWarning()<<"latex failed."<<endl;
+ qWarning()<<"latex failed."<<endl;
QFile::remove(fi.completeBaseName()+".aux");
QFile::remove(fi.completeBaseName()+".log");
return QImage();
@@ -137,7 +137,7 @@ QImage TeXRenderer::renderImageLaTeX( const QString& teXString, \
const QColor& fo QProcess dvipsProcess;
dvipsProcess.start("dvips", QStringList() << "-E" << fi.completeBaseName());
if (!dvipsProcess.waitForFinished()) {
- kWarning()<<"dvips failed."<<endl;
+ qWarning()<<"dvips failed."<<endl;
QFile::remove(fi.completeBaseName()+".dvi");
return QImage();
}
@@ -145,7 +145,7 @@ QImage TeXRenderer::renderImageLaTeX( const QString& teXString, \
const QColor& fo // convert: PS -> PNG
convertProcess.start("convert", QStringList() << "-density" << QString::number(dpi) \
+ 'x' + QString::number(dpi) << fi.completeBaseName()+".ps" << \
fi.completeBaseName()+".png"); if (!convertProcess.waitForFinished()) {
- kWarning()<<"convert failed."<<endl;
+ qWarning()<<"convert failed."<<endl;
QFile::remove(fi.completeBaseName()+".ps");
return QImage();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic