[Kst] branches/work/kst/portto4/kst/src/libkstapp
Adam Treat
treat at kde.org
Thu Mar 1 20:33:04 CET 2007
SVN commit 638383 by treat:
* Remove needless include
* ksdebug -> qdebug
* KConfig ctor fixes
M +1 -2 datawizard.cpp
M +2 -2 extensionmgr.cpp
M +2 -2 kst.cpp
M +1 -1 kst2dplot.cpp
M +2 -2 kstcurvedifferentiate.cpp
M +1 -1 kstdoc.cpp
M +1 -1 kstgfxlinemousehandler.cpp
M +1 -1 kstgfxmousehandlerutils.cpp
M +1 -1 kstgfxtextmousehandler.cpp
M +1 -1 kstgraphfiledialog.cpp
M +1 -1 kstplotgroup.cpp
M +1 -1 kstscalarlistview.cpp
M +1 -1 kststringlistview.cpp
M +1 -1 ksttoplevelview.cpp
M +1 -1 kstviewlabel.cpp
M +1 -1 kstviewlegend.cpp
M +0 -2 kstviewlegend.h
M +1 -1 kstviewobject.cpp
M +1 -1 kstviewpicture.cpp
M +1 -1 kstviewwidget.cpp
M +1 -1 labelrenderer.cpp
M +1 -1 updatethread-multicore.cpp
M +1 -1 updatethread.cpp
--- branches/work/kst/portto4/kst/src/libkstapp/datawizard.cpp #638382:638383
@@ -37,7 +37,6 @@
#include <kmessagebox.h>
#include <knuminput.h>
#include <kiconloader.h>
-#include <qguardedptr.h>
#include <qregexp.h>
#include <qlistview.h>
#include <qheader.h>
@@ -1162,7 +1161,7 @@
}
void DataWizard::saveSettings() {
- KConfig cfg("kstrc", false, false);
+ KConfig cfg("kstrc", KConfig::NoGlobals);
cfg.setGroup("DataWizard");
--- branches/work/kst/portto4/kst/src/libkstapp/extensionmgr.cpp #638382:638383
@@ -41,7 +41,7 @@
void ExtensionMgr::save() {
- KConfig cfg("kstextensionsrc", false, false);
+ KConfig cfg("kstextensionsrc", KConfig::NoGlobals);
cfg.setGroup("Extensions");
QStringList disabled;
QStringList enabled;
@@ -58,7 +58,7 @@
ExtensionMgr::ExtensionMgr() : QObject(), _window(0L) {
- KConfig cfg("kstextensionsrc", true, false);
+ KConfig cfg("kstextensionsrc", KConfig::NoGlobals);
cfg.setGroup("Extensions");
QStringList disabled = cfg.readListEntry("Disabled");
QStringList enabled = cfg.readListEntry("Enabled");
--- branches/work/kst/portto4/kst/src/libkstapp/kst.cpp #638382:638383
@@ -32,7 +32,7 @@
// include files for KDE
#include <kaccel.h>
#include <kcmdlineargs.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kfiledialog.h>
#include <kkeydialog.h>
#include <kmessagebox.h>
@@ -273,7 +273,7 @@
void KstApp::initialize() {
KstSettings::checkUpdates();
- kConfigObject = new KConfig("kstdatarc", false, false);
+ kConfigObject = new KConfig("kstdatarc", KConfig::NoGlobals);
KstDataSource::setupOnStartup(kConfigObject);
// NOTE: This is leaked in commandline mode if we never create a KstApp.
// Not too much of a problem right now, and less messy than hooking in
--- branches/work/kst/portto4/kst/src/libkstapp/kst2dplot.cpp #638382:638383
@@ -42,7 +42,7 @@
#include <QMouseEvent>
// include files for KDE
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kglobal.h>
#include <kdualcolorbutton.h>
#include <kcolorbutton.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstcurvedifferentiate.cpp #638382:638383
@@ -129,8 +129,8 @@
}
-void KstCurveDifferentiateI::saveProperties( ) {
- KConfig cfg("kstrc", false, false);
+void KstCurveDifferentiateI::saveProperties( ) {
+ KConfig cfg("kstrc", KConfig::NoGlobals);
cfg.writeEntry("DifferentiateLineColor", _lineColorOrder);
cfg.writeEntry("DifferentiatePointStyle", _pointStyleOrder);
--- branches/work/kst/portto4/kst/src/libkstapp/kstdoc.cpp #638382:638383
@@ -39,7 +39,7 @@
// include files for KDE
#include <dcopclient.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kdeversion.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstgfxlinemousehandler.cpp #638382:638383
@@ -22,7 +22,7 @@
#include "kstgfxlinemousehandler.h"
#include "kstgfxmousehandlerutils.h"
#include "kst.h"
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kstdoc.h"
#include "kstviewline.h"
#include "kstviewwidget.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kstgfxmousehandlerutils.cpp #638382:638383
@@ -23,7 +23,7 @@
#include <kglobal.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kstgfxmousehandlerutils.h"
QPoint KstGfxMouseHandlerUtils::findNearestPtOnLine(const QPoint& fromPoint, const QPoint& toPoint, const QPoint& pos, const QRect &bounds) {
--- branches/work/kst/portto4/kst/src/libkstapp/kstgfxtextmousehandler.cpp #638382:638383
@@ -22,7 +22,7 @@
#include "kstgfxtextmousehandler.h"
#include "kstgfxmousehandlerutils.h"
#include "kst.h"
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kstdoc.h"
#include "kstviewlabel.h"
#include "kstviewwidget.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kstgraphfiledialog.cpp #638382:638383
@@ -134,7 +134,7 @@
void KstGraphFileDialogI::saveProperties() {
- KConfig cfg("kstrc", false, false);
+ KConfig cfg("kstrc", KConfig::NoGlobals);
cfg.setGroup("AutoSaveImages");
--- branches/work/kst/portto4/kst/src/libkstapp/kstplotgroup.cpp #638382:638383
@@ -22,7 +22,7 @@
#include <qpainter.h>
// include files for KDE
-#include "ksdebug.h"
+#include <qdebug.h>
#include <klocale.h>
// application specific includes
--- branches/work/kst/portto4/kst/src/libkstapp/kstscalarlistview.cpp #638382:638383
@@ -17,7 +17,7 @@
#include "klocale.h"
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kstscalar.h"
#include "kstscalarlistview.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kststringlistview.cpp #638382:638383
@@ -17,7 +17,7 @@
#include "klocale.h"
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kststring.h"
#include "kststringlistview.h"
--- branches/work/kst/portto4/kst/src/libkstapp/ksttoplevelview.cpp #638382:638383
@@ -22,7 +22,7 @@
// include files for Qt
// include files for KDE
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kdeversion.h>
#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
#include <kinputdialog.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewlabel.cpp #638382:638383
@@ -39,7 +39,7 @@
#include <klocale.h>
#include <knuminput.h>
#include <kpopupmenu.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include <qapplication.h>
#include <qbitmap.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewlegend.cpp #638382:638383
@@ -19,7 +19,7 @@
#include "kstviewlegend.h"
#include "enodes.h"
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kst2dplot.h"
#include "kstdatacollection.h"
#include "kstdataobjectcollection.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewlegend.h #638382:638383
@@ -25,8 +25,6 @@
#include "labelparser.h"
#include "kstbasecurve.h"
-#include <qguardedptr.h>
-
class Kst2DPlot;
typedef KstSharedPtr<Kst2DPlot> Kst2DPlotPtr;
class KstViewLegend;
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewobject.cpp #638382:638383
@@ -36,7 +36,7 @@
// include files for KDE
#include <kdatastream.h>
-#include "ksdebug.h"
+#include <qdebug.h>
// application specific includes
#include "kst.h"
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewpicture.cpp #638382:638383
@@ -23,7 +23,7 @@
#include <assert.h>
#include <math.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kglobal.h>
#include <kio/netaccess.h>
#include <klocale.h>
--- branches/work/kst/portto4/kst/src/libkstapp/kstviewwidget.cpp #638382:638383
@@ -17,7 +17,7 @@
#include <assert.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kmultipledrag.h>
#include "kst.h"
--- branches/work/kst/portto4/kst/src/libkstapp/labelrenderer.cpp #638382:638383
@@ -24,7 +24,7 @@
#include "ksttimers.h"
#include "labelparser.h"
-#include "ksdebug.h"
+#include <qdebug.h>
#include <kglobal.h>
#include <iostream>
--- branches/work/kst/portto4/kst/src/libkstapp/updatethread-multicore.cpp #638382:638383
@@ -23,7 +23,7 @@
//Added by qt3to4:
#include <Q3ValueList>
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kstdatacollection.h"
#include "kstdataobjectcollection.h"
--- branches/work/kst/portto4/kst/src/libkstapp/updatethread.cpp #638382:638383
@@ -25,7 +25,7 @@
#include <q3deepcopy.h>
-#include "ksdebug.h"
+#include <qdebug.h>
#include "kstdatacollection.h"
#include "kstdataobjectcollection.h"
More information about the Kst
mailing list