[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/koffice/1.6/koffice/kexi/plugins
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2006-09-25 12:27:14
Message-ID: 1159187234.506947.24020.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 588247 by sebsauer:

macros reactivated, disabled per default.


 M  +5 -5      Makefile.am  
 M  +1 -1      configure.in.in  
 M  +0 -2      macros/lib/Makefile.am  
 D             macros/lib/function.cpp  
 D             macros/lib/function.h  
 M  +0 -15     macros/lib/macro.cpp  
 D             macros/lib/metaproxy.cpp  
 D             macros/lib/metaproxy.h  


--- branches/koffice/1.6/koffice/kexi/plugins/Makefile.am #588246:588247
@@ -2,14 +2,14 @@
 #  REPORTS=reports
 #endif
 
-#if compile_kexi_macros_plugin
-#  MACRODIR=macros
-#endif
+if compile_kexi_macros_plugin
+  MACRODIR=macros
+endif
 
 if compile_kross
   SCRIPTINGDIR=scripting
 endif
 
-SUBDIRS = tables relations migration queries forms $(SCRIPTINGDIR) importexport
+SUBDIRS = tables relations migration queries forms $(SCRIPTINGDIR) $(MACRODIR) importexport
 
-#$(MACRODIR)  $(REPORTS) importwizard relations
+#$(REPORTS) importwizard relations
--- branches/koffice/1.6/koffice/kexi/plugins/configure.in.in #588246:588247
@@ -12,7 +12,7 @@
 AC_ARG_ENABLE(kexi-macros,
     AC_HELP_STRING([--enable-kexi-macros],
                    [build Kexi macro plugin (EXPERIMENTAL) [default=yes]]),
-    compile_kexi_macros_plugin=$enableval, compile_kexi_macros_plugin=yes)
+    compile_kexi_macros_plugin=$enableval, compile_kexi_macros_plugin=no)
 AM_CONDITIONAL(compile_kexi_macros_plugin, test "x$compile_kexi_macros_plugin" == "xyes")
 
 if test "$compile_kexi_macros_plugin" == "yes"; then
--- branches/koffice/1.6/koffice/kexi/plugins/macros/lib/Makefile.am #588246:588247
@@ -5,10 +5,8 @@
     variable.cpp \
     metaparameter.cpp \
     metamethod.cpp \
-    metaproxy.cpp \
     metaobject.cpp \
     action.cpp \
-    function.cpp \
     macroitem.cpp \
     macro.cpp \
     context.cpp \
--- branches/koffice/1.6/koffice/kexi/plugins/macros/lib/macro.cpp #588246:588247
@@ -23,8 +23,6 @@
 #include "context.h"
 #include "variable.h"
 
-#include "metaproxy.h"
-
 #include <qdom.h>
 #include <kdebug.h>
 
@@ -106,19 +104,6 @@
 	d->itemlist.clear();
 }
 
-//no longer needed
-// void Macro::connectSignal(const QObject* sender, const char* signal)
-// {
-// 	MetaProxy* metaproxy = new MetaProxy();
-// 
-// 	metaproxy->connectSignal(sender, signal);
-// 
-// 	connect( metaproxy, SIGNAL(slotCalled(QValueList< KSharedPtr<Variable> >)),
-// 			 this,SLOT(activate(QValueList< KSharedPtr<Variable> >)) );
-// 
-// 	//TODO d->proxies.append( metaproxy );
-// }
-
 //run our macro
 KSharedPtr<Context> Macro::execute(QObject* sender)
 {
[prev in list] [next in list] [prev in thread] [next in thread]