[Kst] branches/work/kst/portto4

Adam Treat treat at kde.org
Thu Jul 5 22:21:22 CEST 2007


SVN commit 683985 by treat:

* Just a minor change as we switch over to qmake...



 D             AdditionalInfo.txt  
 D             CMakeLists.txt  
 D             ConvenienceLibs.cmake  
 D             Mainpage.dox  
 D             Makefile.am.in  
 D             README  
 D             configure.in.bot  
 D             configure.in.in  
 D             doc (directory)  
 D             kst/CMakeLists.txt  
 D             kst/ConfigureChecks.cmake  
 D             kst/Makefile.am  
 AM            kst/build-kst  
 A             kst/config.h   [License: no copyright]
 D             kst/config.h.cmake  
 D             kst/configure.in.in  
 A             kst/docbook (directory)   doc#683300
 D             kst/docbook/CMakeLists.txt  
 D             kst/docbook/Makefile.am  
 D             kst/docbook/kst/CMakeLists.txt  
 D             kst/docbook/kst/Makefile.am  
 A             kst/kst.pri  
 A             kst/kst.pro  
 D             kst/misc/CMakeLists.txt  
 D             kst/misc/Makefile.am  
 D             kst/misc/fonts/CMakeLists.txt  
 D             kst/misc/fonts/Makefile.am  
 D             kst/misc/tutorial/CMakeLists.txt  
 D             kst/misc/tutorial/Makefile.am  
 AM            kst/run-kst  
 AM            kst/run-tests  
 D             kst/src/CMakeLists.txt  
 D             kst/src/d2asc/CMakeLists.txt  
 A             kst/src/d2asc/d2asc.pro  
 D             kst/src/d2d/CMakeLists.txt  
 M  +0 -2      kst/src/d2d/d2d.cpp  
 A             kst/src/d2d/d2d.pro  
 D             kst/src/datasources/CMakeLists.txt  
 D             kst/src/datasources/ascii/CMakeLists.txt  
 D             kst/src/datasources/ascii/Makefile.am  
 M  +2 -2      kst/src/datasources/ascii/ascii.cpp  
 M  +0 -2      kst/src/datasources/ascii/ascii.h  
 A             kst/src/datasources/ascii/ascii.pro  
 M  +2 -16     kst/src/datasources/ascii/asciiconfig.ui  
 D             kst/src/datasources/cdf/CMakeLists.txt  
 A             kst/src/datasources/datasources.pro  
 D             kst/src/datasources/dirfile/CMakeLists.txt  
 D             kst/src/datasources/dirfile/Makefile.am  
 D             kst/src/datasources/fitsimage/CMakeLists.txt  
 D             kst/src/datasources/fitsimage/Makefile.am  
 D             kst/src/datasources/frame/CMakeLists.txt  
 D             kst/src/datasources/frame/Makefile.am  
 D             kst/src/datasources/healpix/CMakeLists.txt  
 D             kst/src/datasources/healpix/Makefile.am  
 D             kst/src/datasources/indirect/CMakeLists.txt  
 D             kst/src/datasources/lfiio/CMakeLists.txt  
 D             kst/src/datasources/lfiio/Makefile.am  
 D             kst/src/datasources/libfitstools/CMakeLists.txt  
 D             kst/src/datasources/nad/CMakeLists.txt  
 D             kst/src/datasources/nad/Makefile.am  
 D             kst/src/datasources/nad/nadslave/CMakeLists.txt  
 D             kst/src/datasources/nad/nadslave/Makefile.am  
 D             kst/src/datasources/naddirect/CMakeLists.txt  
 D             kst/src/datasources/naddirect/Makefile.am  
 D             kst/src/datasources/naddirect/nadslave/CMakeLists.txt  
 D             kst/src/datasources/naddirect/nadslave/Makefile.am  
 D             kst/src/datasources/netcdf/CMakeLists.txt  
 D             kst/src/datasources/planck/CMakeLists.txt  
 D             kst/src/datasources/planck/Makefile.am  
 D             kst/src/datasources/planckIDEF/CMakeLists.txt  
 D             kst/src/datasources/planckIDEF/Makefile.am  
 D             kst/src/datasources/qimagesource/CMakeLists.txt  
 D             kst/src/datasources/qimagesource/Makefile.am  
 D             kst/src/datasources/scuba2/CMakeLists.txt  
 D             kst/src/datasources/scuba2/Makefile.am  
 D             kst/src/datasources/template/CMakeLists.txt  
 D             kst/src/datasources/template/Makefile.am  
 D             kst/src/datasources/wmap/CMakeLists.txt  
 D             kst/src/datasources/wmap/Makefile.am  
 D             kst/src/extensions/CMakeLists.txt  
 D             kst/src/extensions/Makefile.am  
 D             kst/src/extensions/elog/CMakeLists.txt  
 D             kst/src/extensions/js/CMakeLists.txt  
 D             kst/src/extensions/js/Makefile.am  
 D             kst/src/extensions/pulse/CMakeLists.txt  
 D             kst/src/extensions/pulse/Makefile.am  
 D             kst/src/extensions/rana/CMakeLists.txt  
 D             kst/src/extensions/rana/Makefile.am  
 D             kst/src/kst/CMakeLists.txt  
 D             kst/src/kst/Makefile.am  
 A             kst/src/kst/kst.pro  
 D             kst/src/kst/pics/CMakeLists.txt  
 D             kst/src/kst/pics/Makefile.am  
 D             kst/src/libkst/CMakeLists.txt  
 M  +0 -3      kst/src/libkst/kstdatasource.cpp  
 M  +0 -2      kst/src/libkst/kstdebug.cpp  
 M  +0 -1      kst/src/libkst/kstextension.cpp  
 M  +2 -4      kst/src/libkst/kstmatrix.cpp  
 A             kst/src/libkst/kstrevision.h   [License: no copyright]
 M  +1 -1      kst/src/libkst/kstrevision.h.cmake  
 M  +0 -1      kst/src/libkst/kstscalar.cpp  
 M  +0 -1      kst/src/libkst/kststring.cpp  
 A             kst/src/libkst/ksttimers.h   [License: no copyright]
 M  +0 -2      kst/src/libkst/kstvector.cpp  
 A             kst/src/libkst/libkst.pro  
 D             kst/src/libkstapp/CMakeLists.txt  
 M  +0 -2      kst/src/libkstapp/boxitem.cpp  
 M  +0 -1      kst/src/libkstapp/datamanager.cpp  
 M  +0 -1      kst/src/libkstapp/debugdialog.cpp  
 M  +1 -1      kst/src/libkstapp/debugnotifier.cpp  
 M  +0 -2      kst/src/libkstapp/ellipseitem.cpp  
 M  +0 -1      kst/src/libkstapp/exportgraphicsdialog.cpp  
 M  +0 -5      kst/src/libkstapp/exportgraphicsdialog.ui  
 M  +0 -2      kst/src/libkstapp/kstapplication.cpp  
 M  +0 -2      kst/src/libkstapp/labelitem.cpp  
 A             kst/src/libkstapp/libkstapp.pro  
 M  +0 -2      kst/src/libkstapp/lineitem.cpp  
 M  +0 -2      kst/src/libkstapp/mainwindow.cpp  
 M  +0 -1      kst/src/libkstapp/memorywidget.cpp  
 M  +0 -2      kst/src/libkstapp/pictureitem.cpp  
 M  +0 -2      kst/src/libkstapp/plotitem.cpp  
 M  +0 -2      kst/src/libkstapp/svgitem.cpp  
 M  +0 -3      kst/src/libkstapp/tabwidget.cpp  
 M  +0 -1      kst/src/libkstapp/vectoreditordialog.cpp  
 M  +1 -2      kst/src/libkstapp/view.cpp  
 M  +0 -3      kst/src/libkstapp/viewitem.cpp  
 M  +0 -2      kst/src/libkstapp/viewitemdialog.cpp  
 D             kst/src/libkstmath/CMakeLists.txt  
 M  +0 -1      kst/src/libkstmath/kstbasecurve.cpp  
 M  +0 -2      kst/src/libkstmath/kstdataobject.cpp  
 A             kst/src/libkstmath/libkstmath.pro  
 D             kst/src/old_libkstapp/CMakeLists.txt  
 D             kst/src/old_libkstapp/Makefile.am  
 D             kst/src/old_widgets/CMakeLists.txt  
 D             kst/src/old_widgets/Makefile.am  
 D             kst/src/plugins/CMakeLists.txt  
 D             kst/src/plugins/Makefile.am  
 D             kst/src/plugins/bin/CMakeLists.txt  
 D             kst/src/plugins/bin/Makefile.am  
 D             kst/src/plugins/chop/CMakeLists.txt  
 D             kst/src/plugins/chop/Makefile.am  
 D             kst/src/plugins/convolution/CMakeLists.txt  
 D             kst/src/plugins/convolution/Makefile.am  
 D             kst/src/plugins/convolution/convolve/CMakeLists.txt  
 D             kst/src/plugins/convolution/convolve/Makefile.am  
 D             kst/src/plugins/convolution/deconvolve/CMakeLists.txt  
 D             kst/src/plugins/convolution/deconvolve/Makefile.am  
 D             kst/src/plugins/correlation/CMakeLists.txt  
 D             kst/src/plugins/correlation/Makefile.am  
 D             kst/src/plugins/correlation/autocorrelation/CMakeLists.txt  
 D             kst/src/plugins/correlation/autocorrelation/Makefile.am  
 D             kst/src/plugins/correlation/crosscorrelation/CMakeLists.txt  
 D             kst/src/plugins/correlation/crosscorrelation/Makefile.am  
 D             kst/src/plugins/crossspectrum/CMakeLists.txt  
 D             kst/src/plugins/crossspectrum/Makefile.am  
 D             kst/src/plugins/cumulative_sum/CMakeLists.txt  
 D             kst/src/plugins/cumulative_sum/Makefile.am  
 D             kst/src/plugins/despike/CMakeLists.txt  
 D             kst/src/plugins/despike/Makefile.am  
 D             kst/src/plugins/differentiation/CMakeLists.txt  
 D             kst/src/plugins/differentiation/Makefile.am  
 D             kst/src/plugins/discretizing_filters/CMakeLists.txt  
 D             kst/src/plugins/discretizing_filters/Makefile.am  
 D             kst/src/plugins/editor/CMakeLists.txt  
 D             kst/src/plugins/editor/Makefile.am  
 D             kst/src/plugins/effective_bandwidth/CMakeLists.txt  
 D             kst/src/plugins/effective_bandwidth/Makefile.am  
 D             kst/src/plugins/fits/CMakeLists.txt  
 D             kst/src/plugins/fits/Makefile.am  
 D             kst/src/plugins/fits/gradient_unweighted/CMakeLists.txt  
 D             kst/src/plugins/fits/gradient_unweighted/Makefile.am  
 D             kst/src/plugins/fits/gradient_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits/gradient_weighted/Makefile.am  
 D             kst/src/plugins/fits/kneefrequency_unweighted/CMakeLists.txt  
 D             kst/src/plugins/fits/kneefrequency_unweighted/Makefile.am  
 D             kst/src/plugins/fits/linear_unweighted/CMakeLists.txt  
 D             kst/src/plugins/fits/linear_unweighted/Makefile.am  
 D             kst/src/plugins/fits/linear_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits/linear_weighted/Makefile.am  
 D             kst/src/plugins/fits/polynomial_unweighted/CMakeLists.txt  
 D             kst/src/plugins/fits/polynomial_unweighted/Makefile.am  
 D             kst/src/plugins/fits/polynomial_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits/polynomial_weighted/Makefile.am  
 D             kst/src/plugins/fits/sinusoid_unweighted/CMakeLists.txt  
 D             kst/src/plugins/fits/sinusoid_unweighted/Makefile.am  
 D             kst/src/plugins/fits/sinusoid_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits/sinusoid_weighted/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/exponential/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/exponential/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/exponential_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/exponential_weighted/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/gaussian/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/gaussian/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/gaussian_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/gaussian_weighted/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/lorentzian/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/lorentzian/Makefile.am  
 D             kst/src/plugins/fits_nonlinear/lorentzian_weighted/CMakeLists.txt  
 D             kst/src/plugins/fits_nonlinear/lorentzian_weighted/Makefile.am  
 D             kst/src/plugins/interpolations/CMakeLists.txt  
 D             kst/src/plugins/interpolations/Makefile.am  
 D             kst/src/plugins/interpolations/akima/CMakeLists.txt  
 D             kst/src/plugins/interpolations/akima/Makefile.am  
 D             kst/src/plugins/interpolations/akima_periodic/CMakeLists.txt  
 D             kst/src/plugins/interpolations/akima_periodic/Makefile.am  
 D             kst/src/plugins/interpolations/cspline/CMakeLists.txt  
 D             kst/src/plugins/interpolations/cspline/Makefile.am  
 D             kst/src/plugins/interpolations/cspline_periodic/CMakeLists.txt  
 D             kst/src/plugins/interpolations/cspline_periodic/Makefile.am  
 D             kst/src/plugins/interpolations/linear/CMakeLists.txt  
 D             kst/src/plugins/interpolations/linear/Makefile.am  
 D             kst/src/plugins/interpolations/polynomial/CMakeLists.txt  
 D             kst/src/plugins/interpolations/polynomial/Makefile.am  
 D             kst/src/plugins/linefit/CMakeLists.txt  
 D             kst/src/plugins/linefit/Makefile.am  
 D             kst/src/plugins/noise_addition/CMakeLists.txt  
 D             kst/src/plugins/noise_addition/Makefile.am  
 D             kst/src/plugins/pass_filters/CMakeLists.txt  
 D             kst/src/plugins/pass_filters/Makefile.am  
 D             kst/src/plugins/pass_filters/butterworth_bandpass/CMakeLists.txt  
 D             kst/src/plugins/pass_filters/butterworth_bandpass/Makefile.am  
 D             kst/src/plugins/pass_filters/butterworth_bandstop/CMakeLists.txt  
 D             kst/src/plugins/pass_filters/butterworth_bandstop/Makefile.am  
 D             kst/src/plugins/pass_filters/butterworth_highpass/CMakeLists.txt  
 D             kst/src/plugins/pass_filters/butterworth_highpass/Makefile.am  
 D             kst/src/plugins/pass_filters/butterworth_lowpass/CMakeLists.txt  
 D             kst/src/plugins/pass_filters/butterworth_lowpass/Makefile.am  
 D             kst/src/plugins/periodogram/CMakeLists.txt  
 D             kst/src/plugins/periodogram/Makefile.am  
 D             kst/src/plugins/phase/CMakeLists.txt  
 D             kst/src/plugins/phase/Makefile.am  
 D             kst/src/plugins/shift/CMakeLists.txt  
 D             kst/src/plugins/shift/Makefile.am  
 D             kst/src/plugins/statistics/CMakeLists.txt  
 D             kst/src/plugins/statistics/Makefile.am  
 D             kst/src/plugins/syncbin/CMakeLists.txt  
 D             kst/src/plugins/syncbin/Makefile.am  
 D             kst/src/plugins/testplugin/CMakeLists.txt  
 D             kst/src/plugins/testplugin/Makefile.am  
 D             kst/src/widgets/CMakeLists.txt  
 M  +0 -2      kst/src/widgets/colorbutton.cpp  
 M  +0 -2      kst/src/widgets/fillandstroke.cpp  
 M  +0 -2      kst/src/widgets/gradienteditor.cpp  
 M  +9 -1      kst/src/widgets/kstwidgets.cpp  
 M  +0 -9      kst/src/widgets/kstwidgets.h  
 A             kst/src/widgets/widgets.pro  
 D             kst/tests/CMakeLists.txt  
 D             kst/tests/healpix/CMakeLists.txt  
 D             kst/tests/healpix/Makefile.am  
 D             kst/tests/kstXbench/CMakeLists.txt  
 D             kst/tests/planck/CMakeLists.txt  
 D             kst/tests/planck/Makefile.am  


** branches/work/kst/portto4/kst/build-kst #property svn:executable
   + *
** branches/work/kst/portto4/kst/run-kst #property svn:executable
   + *
** branches/work/kst/portto4/kst/run-tests #property svn:executable
   + *
--- branches/work/kst/portto4/kst/src/d2d/d2d.cpp #683984:683985
@@ -27,8 +27,6 @@
 
 #include "kstdataplugin.h"
 
-#include <kservicetypetrader.h>
-
 void Usage() {
   fprintf(stderr, "usage: d2d in_filename out_filename [-t <out_type>]\n");
   fprintf(stderr, "           [-f <first frame>] [-n <numframes>] [-s skip [-a]] \n");
--- branches/work/kst/portto4/kst/src/datasources/ascii/ascii.cpp #683984:683985
@@ -31,7 +31,7 @@
 #include <qspinbox.h>
 #include <qtextdocument.h>
 
-#include <kcombobox.h>
+#include <qcombobox.h>
 
 #include <kstmath.h>
 #include "ascii.h"
@@ -1054,6 +1054,6 @@
 
 }
 
-#include "ascii.moc"
+Q_EXPORT_PLUGIN2(kstdata_ascii, AsciiPlugin)
 
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/datasources/ascii/ascii.h #683984:683985
@@ -120,7 +120,5 @@
     virtual KstDataSourceConfigWidget *configWidget(QSettings *cfg, const QString& filename) const;
 };
 
-Q_EXPORT_PLUGIN2(kstdata_ascii, AsciiPlugin)
-
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/datasources/ascii/asciiconfig.ui #683984:683985
@@ -64,7 +64,7 @@
       </widget>
      </item>
      <item>
-      <widget class="KComboBox" name="_indexVector" >
+      <widget class="QComboBox" name="_indexVector" >
        <property name="sizePolicy" >
         <sizepolicy>
          <hsizetype>1</hsizetype>
@@ -89,7 +89,7 @@
       </widget>
      </item>
      <item>
-      <widget class="KComboBox" name="_indexType" >
+      <widget class="QComboBox" name="_indexType" >
        <property name="sizePolicy" >
         <sizepolicy>
          <hsizetype>1</hsizetype>
@@ -133,9 +133,6 @@
        <property name="wordWrap" >
         <bool>false</bool>
        </property>
-       <property name="buddy" >
-        <cstring>lineEdit2</cstring>
-       </property>
       </widget>
      </item>
      <item>
@@ -423,22 +420,11 @@
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>_delimiters</tabstop>
   <tabstop>_indexVector</tabstop>
   <tabstop>_indexType</tabstop>
  </tabstops>
- <includes>
-  <include location="local" >kcombobox.h</include>
-  <include location="local" >kcombobox.h</include>
- </includes>
  <resources/>
  <connections>
   <connection>
--- branches/work/kst/portto4/kst/src/libkst/kstdatasource.cpp #683984:683985
@@ -752,7 +752,4 @@
   return _instance;
 }
 
-
-
-#include "kstdatasource.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkst/kstdebug.cpp #683984:683985
@@ -199,6 +199,4 @@
   _hasNewError = false;
 }
 
-
-#include "kstdebug.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkst/kstextension.cpp #683984:683985
@@ -54,5 +54,4 @@
   Q_UNUSED(args)
 }
 
-#include "kstextension.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkst/kstmatrix.cpp #683984:683985
@@ -548,10 +548,8 @@
   _stepY = stepY;
   _minX = minX;
   _minY = minY;
-  
-  setDirty();  
+
+  setDirty();
 }
 
-
-#include "kstmatrix.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkst/kstrevision.h.cmake #683984:683985
@@ -1,3 +1,3 @@
 #ifndef KSTREVISION
-#define KSTREVISION "${libkst_WC_REVISION}"
+#define KSTREVISION 1
 #endif
--- branches/work/kst/portto4/kst/src/libkst/kstscalar.cpp #683984:683985
@@ -195,5 +195,4 @@
   KST::scalarList.doRename(this, newTag);
 }
 
-#include "kstscalar.moc"
 // vim: et ts=2 sw=2
--- branches/work/kst/portto4/kst/src/libkst/kststring.cpp #683984:683985
@@ -129,5 +129,4 @@
   emit trigger();
 }
 
-#include "kststring.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkst/kstvector.cpp #683984:683985
@@ -708,9 +708,7 @@
   _saveData = save;
 }
 
-
 #undef ZERO_MEMORY
 #undef INITSIZE
 
-#include "kstvector.moc"
 // vim: et sw=2 ts=2
--- branches/work/kst/portto4/kst/src/libkstapp/boxitem.cpp #683984:683985
@@ -116,6 +116,4 @@
 
 }
 
-#include "boxitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/datamanager.cpp #683984:683985
@@ -34,5 +34,4 @@
 
 }
 
-#include "datamanager.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/debugdialog.cpp #683984:683985
@@ -52,5 +52,4 @@
 
 }
 
-#include "debugdialog.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/debugnotifier.cpp #683984:683985
@@ -92,5 +92,5 @@
 }
 
 #undef TIMER_ITERATIONS
-#include "debugnotifier.moc"
+
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/ellipseitem.cpp #683984:683985
@@ -48,6 +48,4 @@
 
 }
 
-#include "ellipseitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/exportgraphicsdialog.cpp #683984:683985
@@ -26,5 +26,4 @@
 
 }
 
-#include "exportgraphicsdialog.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/exportgraphicsdialog.ui #683984:683985
@@ -496,11 +496,6 @@
   <tabstop>_radioButtonAll</tabstop>
   <tabstop>_autosave</tabstop>
  </tabstops>
- <includes>
-  <include location="local" >kurlrequester.h</include>
-  <include location="local" >klineedit.h</include>
-  <include location="local" >kpushbutton.h</include>
- </includes>
  <resources/>
  <connections>
   <connection>
--- branches/work/kst/portto4/kst/src/libkstapp/kstapplication.cpp #683984:683985
@@ -32,6 +32,4 @@
   return _mainWindow;
 }
 
-#include "kstapplication.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/labelitem.cpp #683984:683985
@@ -72,6 +72,4 @@
 
 }
 
-#include "labelitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/lineitem.cpp #683984:683985
@@ -157,6 +157,4 @@
 
 }
 
-#include "lineitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #683984:683985
@@ -501,6 +501,4 @@
 
 }
 
-#include "mainwindow.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/memorywidget.cpp #683984:683985
@@ -39,5 +39,4 @@
 
 }
 
-#include "memorywidget.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/pictureitem.cpp #683984:683985
@@ -49,6 +49,4 @@
 
 }
 
-#include "pictureitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #683984:683985
@@ -76,6 +76,4 @@
 
 }
 
-#include "plotitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/svgitem.cpp #683984:683985
@@ -49,6 +49,4 @@
 
 }
 
-#include "svgitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/tabwidget.cpp #683984:683985
@@ -110,7 +110,4 @@
 
 }
 
-
-#include "tabwidget.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/vectoreditordialog.cpp #683984:683985
@@ -45,5 +45,4 @@
 
 }
 
-#include "vectoreditordialog.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/view.cpp #683984:683985
@@ -155,8 +155,7 @@
     fitInView(sceneRect());
   }
 }
+
 }
 
-#include "view.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.cpp #683984:683985
@@ -831,9 +831,6 @@
   _item->setTransform(_newTransform);
 }
 
-
 }
 
-#include "viewitem.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/viewitemdialog.cpp #683984:683985
@@ -152,6 +152,4 @@
 
 }
 
-#include "viewitemdialog.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstmath/kstbasecurve.cpp #683984:683985
@@ -78,5 +78,4 @@
   emit modifiedLegendEntry();
 }
 
-#include "kstbasecurve.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstmath/kstdataobject.cpp #683984:683985
@@ -759,6 +759,4 @@
   return false;
 }
 
-
-#include "kstdataobject.moc"
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/colorbutton.cpp #683984:683985
@@ -72,6 +72,4 @@
 
 }
 
-#include "colorbutton.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/fillandstroke.cpp #683984:683985
@@ -178,6 +178,4 @@
 
 }
 
-#include "fillandstroke.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/gradienteditor.cpp #683984:683985
@@ -201,6 +201,4 @@
 
 }
 
-#include "gradienteditor.moc"
-
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/kstwidgets.cpp #683984:683985
@@ -10,4 +10,12 @@
  ***************************************************************************/
 
 #include "kstwidgets.h"
-#include "kstwidgets.moc"
+
+KstWidgets::KstWidgets(QObject *parent)
+    : QObject(parent) {
+  _plugins.append(new ColorButtonPlugin(this));
+  _plugins.append(new FillAndStrokePlugin(this));
+  _plugins.append(new GradientEditorPlugin(this));
+}
+
+Q_EXPORT_PLUGIN2(kstwidgets, KstWidgets)
--- branches/work/kst/portto4/kst/src/widgets/kstwidgets.h #683984:683985
@@ -125,15 +125,6 @@
 private:
   QList<QDesignerCustomWidgetInterface*> _plugins;
 };
-Q_EXPORT_PLUGIN2(kstwidgets, KstWidgets)
 
-
-KstWidgets::KstWidgets(QObject *parent)
-    : QObject(parent) {
-  _plugins.append(new ColorButtonPlugin(this));
-  _plugins.append(new FillAndStrokePlugin(this));
-  _plugins.append(new GradientEditorPlugin(this));
-}
-
 #endif
 // vim: ts=2 sw=2 et


More information about the Kst mailing list