[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 476690 by staikos:

- fix enable-final build a bit
- add missing dependencies
- remove some kdebugs


 M  +6 -4      Makefile.am  
 M  +12 -4     ksdebug.h  
 M  +1 -1      kstdatanotifier.cpp  
 M  +1 -1      kstdebugnotifier.cpp  
 M  +2 -3      plugin.cpp  
 M  +2 -3      plugincollection.cpp  
 M  +0 -1      pluginxmlparser.cpp  
 M  +0 -1      stdinsource.cpp  


--- trunk/extragear/graphics/kst/kst/Makefile.am #476689:476690
@@ -286,14 +286,16 @@
 imagedialogwidget.lo: matrixselector.h curveplacementwidget.h
 kst.lo: curvedifferentiate.h
 kst2dplot.lo: plugindialogwidget.h matrixdialogwidget.h vectordialogwidget.h
+kstcsddialog_i.lo: csddialogwidget.h
 kstdatadialog.lo: editmultiplewidget.h kstdatadialog.ui.h kstdatadialog.ui
 kstdatamanager_i.lo: curvedialogwidget.h histogramdialogwidget.h imagedialogwidget.h
 ksteqdialog_i.lo: comboboxselection.h eqdialogwidget.h
-ksteventmonitor_i.lo: comboboxselection.h
-kstfilterdialog_i.lo: comboboxselection.h
-kstfitdialog_i.lo: comboboxselection.h
+ksteventmonitor_i.lo: comboboxselection.h eventmonitorwidget.h
+kstfilterdialog_i.lo: comboboxselection.h plugindialogwidget.h
+kstfitdialog_i.lo: comboboxselection.h plugindialogwidget.h
 kstplotdialog_i.lo: comboboxselection.h
-kstplugindialog_i.lo: comboboxselection.h pluginmanager.h
+kstplugindialog_i.lo: comboboxselection.h pluginmanager.h plugindialogwidget.h
+kstpsddialog_i.lo: psddialogwidget.h
 kstsettingsdlg.lo: kstsettingsdlg.ui.h kstsettingsdlg.ui
 kstviewbox.cpp: editviewobjectdialog.h
 kstwidgets.lo: comboboxselection.h curveappearancewidget.h curveplacementwidget.h datarangewidget.h editmultiplewidget.h fftoptionswidget.h matrixselector.h scalarselector.h stringselector.h vectorselector.h
--- trunk/extragear/graphics/kst/kst/ksdebug.h #476689:476690
@@ -52,9 +52,17 @@
  * messages you see.
  */
 
-typedef kstdbgstream & (*KDBGFUNC)(kstdbgstream &); // manipulator function
-typedef kstndbgstream & (*KNDBGFUNC)(kstndbgstream &); // manipulator function
+typedef kstdbgstream & (*KstDBGFUNC)(kstdbgstream &); // manipulator function
+typedef kstndbgstream & (*KstNDBGFUNC)(kstndbgstream &); // manipulator function
 
+#ifdef k_funcinfo
+#undef k_funcinfo
+#endif
+
+#ifdef k_lineinfo
+#undef k_lineinfo
+#endif
+
 #ifdef __GNUC__
 #define k_funcinfo "[" << __PRETTY_FUNCTION__ << "] "
 #else
@@ -255,7 +263,7 @@
      * @param f the function to invoke
      * @return the return value of @p f
      */
-    kstdbgstream& operator<<(KDBGFUNC f) {
+    kstdbgstream& operator<<(KstDBGFUNC f) {
 	if (!print) return *this;
 	return (*f)(*this);
     }
@@ -543,7 +551,7 @@
      * Does nothing.
      * @return this stream
      */
-    kstndbgstream& operator<<(KNDBGFUNC) { return *this; }
+    kstndbgstream& operator<<(KstNDBGFUNC) { return *this; }
     /**
      * Does nothing.
      * @return this stream
--- trunk/extragear/graphics/kst/kst/kstdatanotifier.cpp #476689:476690
@@ -73,6 +73,6 @@
   }
 }
 
-
+#undef TIMER_ITERATIONS
 #include "kstdatanotifier.moc"
 // vim: ts=2 sw=2 et
--- trunk/extragear/graphics/kst/kst/kstdebugnotifier.cpp #476689:476690
@@ -97,6 +97,6 @@
   _gotPress = false;
 }
 
-
+#undef TIMER_ITERATIONS
 #include "kstdebugnotifier.moc"
 // vim: ts=2 sw=2 et
--- trunk/extragear/graphics/kst/kst/plugin.cpp #476689:476690
@@ -20,7 +20,6 @@
 
 #include <klibloader.h>
 #include <klocale.h>
-#include <kdebug.h>
 
 
 const int Plugin::CallError = -424242;
@@ -31,7 +30,7 @@
   _freeSymbol = 0L;
   _errorSymbol = 0L;
   _parameterName = 0L;
-  //kdDebug() << "Creating Plugin: " << long(this) << endl;
+  //kstdDebug() << "Creating Plugin: " << long(this) << endl;
 }
 
 
@@ -46,7 +45,7 @@
     _lib = 0L;
   }
 
-  //kdDebug() << "Destroying Plugin: " << long(this) << endl;
+  //kstdDebug() << "Destroying Plugin: " << long(this) << endl;
 }
 
 
--- trunk/extragear/graphics/kst/kst/plugincollection.cpp #476689:476690
@@ -21,7 +21,6 @@
 #include "pluginloader.h"
 #include "pluginxmlparser.h"
 
-#include <kdebug.h>
 #include <kdeversion.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -208,7 +207,7 @@
   QStringList dirs = KGlobal::dirs()->resourceDirs("kstplugins");
   dirs += KGlobal::dirs()->resourceDirs("kstpluginlib");
   for (QStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) {
-    //kdDebug() << "Scanning [" << *it << "] for plugins." << endl;
+    //kstdDebug() << "Scanning [" << *it << "] for plugins." << endl;
     QDir d(*it);
 
     d.setFilter(QDir::Files | QDir::NoSymLinks);
@@ -224,7 +223,7 @@
     int status;
 
     while ((fi = fit.current()) != 0L) {
-      //kdDebug() << "Parsing [" << (*it + fi->fileName()) << "]" << endl;
+      //kstdDebug() << "Parsing [" << (*it + fi->fileName()) << "]" << endl;
       status = _parser->parseFile(*it + fi->fileName());
       if (status == 0) {
         // dupe? - prefer earlier installations
--- trunk/extragear/graphics/kst/kst/pluginxmlparser.cpp #476689:476690
@@ -17,7 +17,6 @@
 
 #include "pluginxmlparser.h"
 
-#include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <qfile.h>
--- trunk/extragear/graphics/kst/kst/stdinsource.cpp #476689:476690
@@ -18,7 +18,6 @@
 #include "config.h"
 #include "stdinsource.h"
 
-#include <kdebug.h>
 #include <ktempfile.h>
 
 #include <stdlib.h>