[Kst] branches/work/kst/portto4/kst/src/widgets

Adam Treat treat at kde.org
Wed Mar 14 19:42:01 CET 2007


SVN commit 642580 by treat:

* Export


 M  +9 -10     CMakeLists.txt  
 M  +0 -2      colorpalettewidget.cpp  
 M  +3 -1      colorpalettewidget.h  
 M  +0 -2      curveappearancewidget.cpp  
 M  +3 -1      curveappearancewidget.h  
 M  +0 -2      curveplacementwidget.cpp  
 M  +3 -1      curveplacementwidget.h  
 M  +2 -3      draggablelistbox.h  
 M  +2 -3      draggablelistview.h  
 M  +0 -2      editmultiplewidget.cpp  
 M  +2 -0      editmultiplewidget.h  
 M  +3 -1      kstcombobox.h  
 M  +0 -2      kstdatarange.cpp  
 M  +3 -1      kstdatarange.h  
 M  +0 -2      kstfftoptions.cpp  
 M  +3 -1      kstfftoptions.h  
 M  +0 -2      matrixselector.cpp  
 M  +3 -1      matrixselector.h  
 M  +1 -1      plotlistbox.h  
 M  +0 -2      scalareditor.cpp  
 M  +2 -0      scalareditor.h  
 M  +0 -2      scalarselector.cpp  
 M  +3 -1      scalarselector.h  
 M  +0 -2      stringeditor.cpp  
 M  +2 -0      stringeditor.h  
 M  +0 -2      stringselector.cpp  
 M  +3 -1      stringselector.h  
 M  +1 -2      vectorlistview.h  
 M  +0 -2      vectorselector.cpp  
 M  +3 -1      vectorselector.h  


--- branches/work/kst/portto4/kst/src/widgets/CMakeLists.txt #642579:642580
@@ -54,20 +54,19 @@
 set_target_properties(kstwidgets PROPERTIES VERSION ${KST_LIBKST_VERSION} SOVERSION 1)
 install(TARGETS kstwidgets DESTINATION ${LIB_INSTALL_DIR})
 
-
 ########### next target ###############
 
-set(kstwidgets_PART_SRCS ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp)
+# set(kstwidgets_PART_SRCS ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp)
+# 
+# kde4_automoc(${kstwidgets_PART_SRCS})
+# 
+# kde4_add_plugin(kstwidgets ${kstwidgets_PART_SRCS})
+# 
+# target_link_libraries(kstwidgets ${KDE4_KDECORE_LIBS})
+# 
+# install(TARGETS kstwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
 
-kde4_automoc(${kstwidgets_PART_SRCS})
 
-kde4_add_plugin(kstwidgets ${kstwidgets_PART_SRCS})
-
-target_link_libraries(kstwidgets ${KDE4_KDECORE_LIBS})
-
-install(TARGETS kstwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
-
-
 ########### install files ###############
 
 
--- branches/work/kst/portto4/kst/src/widgets/colorpalettewidget.cpp #642579:642580
@@ -20,8 +20,6 @@
 #include <QPixmap>
 #include <QPainter>
 
-#include <kst_export.h>
-
 ColorPaletteWidget::ColorPaletteWidget(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/colorpalettewidget.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QWidget>
 #include "ui_colorpalettewidget4.h"
 
+#include "kst_export.h"
+
 class ColorPaletteWidget : public QWidget, public Ui::ColorPaletteWidget {
   Q_OBJECT
 
@@ -38,7 +40,7 @@
 
 private:
   void init();
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/curveappearancewidget.cpp #642579:642580
@@ -28,8 +28,6 @@
 #include <kstcurvepointsymbol.h>
 #include <kstcolorsequence.h>
 
-#include <kst_export.h>
-
 CurveAppearanceWidget::CurveAppearanceWidget(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/curveappearancewidget.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QWidget>
 #include "ui_curveappearancewidget4.h"
 
+#include "kst_export.h"
+
 class CurveAppearanceWidget : public QWidget, public Ui::CurveAppearanceWidget {
   Q_OBJECT
 
@@ -58,7 +60,7 @@
 
 protected:
   void resizeEvent(QResizeEvent *pEvent);
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/curveplacementwidget.cpp #642579:642580
@@ -19,8 +19,6 @@
 
 #include <kstdatacollection.h>
 
-#include <kst_export.h>
-
 CurvePlacementWidget::CurvePlacementWidget(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/curveplacementwidget.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QWidget>
 #include "ui_curveplacementwidget4.h"
 
+#include "kst_export.h"
+
 class CurvePlacementWidget : public QWidget, public Ui::CurvePlacementWidget {
   Q_OBJECT
 
@@ -44,7 +46,7 @@
   void updatePlotList();
   void updateEnabled();
   void updateGrid();
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/draggablelistbox.h #642579:642580
@@ -25,7 +25,7 @@
 
 #include "kst_export.h"
 
-class KST_EXPORT DraggableListBox : public Q3ListBox {
+class DraggableListBox : public Q3ListBox {
   Q_OBJECT
   public:
     DraggableListBox(QWidget *parent = 0L, const char *name = 0L);
@@ -49,8 +49,7 @@
   private:
     QPoint _pressPos;
     bool _dragEnabled;
-};
+} KST_EXPORT;
 
-
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/draggablelistview.h #642579:642580
@@ -27,7 +27,7 @@
 
 #include "kst_export.h"
 
-class KST_EXPORT DraggableListView : public Q3ListView {
+class DraggableListView : public Q3ListView {
   Q_OBJECT
   public:
     DraggableListView(QWidget *parent = 0L, const char *name = 0L);
@@ -47,8 +47,7 @@
   private:
     QPoint _pressPos;
     bool _dragEnabled;
-};
+} KST_EXPORT;
 
-
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/editmultiplewidget.cpp #642579:642580
@@ -19,8 +19,6 @@
 
 #include <QRegExp>
 
-#include <kst_export.h>
-
 EditMultipleWidget::EditMultipleWidget(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/editmultiplewidget.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QWidget>
 #include "ui_editmultiplewidget4.h"
 
+#include "kst_export.h"
+
 class EditMultipleWidget : public QWidget, public Ui::EditMultipleWidget {
   Q_OBJECT
 
--- branches/work/kst/portto4/kst/src/widgets/kstcombobox.h #642579:642580
@@ -22,6 +22,8 @@
 //Added by qt3to4:
 #include <QFocusEvent>
 
+#include "kst_export.h"
+
 /*This class is a wrapper around KComboBox that does something different in read only mode...
   basically, we act like a readwrite combo with one important difference... when the widget
   loses focus or return is pressed we validate and make sure that what is left in the
@@ -49,7 +51,7 @@
   private:
     void commonConstructor();
     bool _trueRW; //captures whether this combo is *truly* read write as opposed to psuedo
-};
+} KST_EXPORT;
 
 
 #endif
--- branches/work/kst/portto4/kst/src/widgets/kstdatarange.cpp #642579:642580
@@ -29,8 +29,6 @@
 #include <enodes.h>
 #include <kstdateparser.h>
 
-#include <kst_export.h>
-
 KstDataRange::KstDataRange(QWidget *parent)
     : QWidget(parent), _time(false) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/kstdatarange.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QWidget>
 #include "ui_kstdatarange4.h"
 
+#include "kst_export.h"
+
 class KstDataRange : public QWidget, public Ui::KstDataRange {
   Q_OBJECT
 
@@ -51,7 +53,7 @@
 
 private:
   bool _time;
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/kstfftoptions.cpp #642579:642580
@@ -21,8 +21,6 @@
 
 #include <kstobjectdefaults.h>
 
-#include <kst_export.h>
-
 KstFFTOptions::KstFFTOptions(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/kstfftoptions.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QWidget>
 #include "ui_kstfftoptions4.h"
 
+#include "kst_export.h"
+
 class KstFFTOptions : public QWidget, public Ui::KstFFTOptions {
   Q_OBJECT
 
@@ -40,7 +42,7 @@
 
 private:
   void init();
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/matrixselector.cpp #642579:642580
@@ -29,8 +29,6 @@
 #include <kstdataobject.h>
 #include <dialoglauncher.h>
 
-#include <kst_export.h>
-
 MatrixSelector::MatrixSelector(QWidget *parent)
     : QWidget(parent), _provideNoneMatrix(false) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/matrixselector.h #642579:642580
@@ -23,6 +23,8 @@
 
 #include <kstdataobject.h>
 
+#include "kst_export.h"
+
 class MatrixSelector : public QWidget, public Ui::MatrixSelector {
   Q_OBJECT
 
@@ -54,7 +56,7 @@
 
 private:
   bool _provideNoneMatrix;
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/plotlistbox.h #642579:642580
@@ -39,7 +39,7 @@
 
   signals:
     void changed();
-};
+} KST_EXPORT;
 
 
 #endif
--- branches/work/kst/portto4/kst/src/widgets/scalareditor.cpp #642579:642580
@@ -17,8 +17,6 @@
 
 #include "scalareditor.h"
 
-#include <kst_export.h>
-
 ScalarEditor::ScalarEditor(QWidget *parent)
     : QDialog(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/scalareditor.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QDialog>
 #include "ui_scalareditor4.h"
 
+#include "kst_export.h"
+
 class ScalarEditor : public QDialog, public Ui::ScalarEditor {
   Q_OBJECT
 
--- branches/work/kst/portto4/kst/src/widgets/scalarselector.cpp #642579:642580
@@ -33,8 +33,6 @@
 #include <kstdatacollection.h>
 #include <enodes.h>
 
-#include <kst_export.h>
-
 ScalarSelector::ScalarSelector(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/scalarselector.h #642579:642580
@@ -23,6 +23,8 @@
 
 #include <kstdataobject.h>
 
+#include "kst_export.h"
+
 class ScalarSelector : public QWidget, public Ui::ScalarSelector {
   Q_OBJECT
 
@@ -50,7 +52,7 @@
 
 private:
   void init();
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/stringeditor.cpp #642579:642580
@@ -17,8 +17,6 @@
 
 #include "stringeditor.h"
 
-#include <kst_export.h>
-
 StringEditor::StringEditor(QWidget *parent)
     : QDialog(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/stringeditor.h #642579:642580
@@ -21,6 +21,8 @@
 #include <QDialog>
 #include "ui_stringeditor4.h"
 
+#include "kst_export.h"
+
 class StringEditor : public QDialog, public Ui::StringEditor {
   Q_OBJECT
 
--- branches/work/kst/portto4/kst/src/widgets/stringselector.cpp #642579:642580
@@ -33,8 +33,6 @@
 #include <kstdatacollection.h>
 #include <enodes.h>
 
-#include <kst_export.h>
-
 StringSelector::StringSelector(QWidget *parent)
     : QWidget(parent) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/stringselector.h #642579:642580
@@ -23,6 +23,8 @@
 
 #include <kstdataobject.h>
 
+#include "kst_export.h"
+
 class StringSelector : public QWidget, public Ui::StringSelector {
   Q_OBJECT
 
@@ -50,7 +52,7 @@
 
 private:
   void init();
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/vectorlistview.h #642579:642580
@@ -37,8 +37,7 @@
     virtual void dropEvent(QDropEvent *e);
     virtual void startDrag();
 
-};
+} KST_EXPORT;
 
-
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.cpp #642579:642580
@@ -30,8 +30,6 @@
 #include <dialoglauncher.h>
 #include <kstdataobject.h>
 
-#include <kst_export.h>
-
 VectorSelector::VectorSelector(QWidget *parent)
     : QWidget(parent), _provideNoneVector(false) {
   setupUi(this);
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.h #642579:642580
@@ -23,6 +23,8 @@
 
 #include <kstdataobject.h>
 
+#include "kst_export.h"
+
 class VectorSelector : public QWidget, public Ui::VectorSelector {
   Q_OBJECT
 
@@ -54,7 +56,7 @@
 
 private:
   bool _provideNoneVector;
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et


More information about the Kst mailing list