Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 0 insertions, 239 deletions

diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am
deleted file mode 100644
index b805ef18..00000000
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
-	-I$(top_srcdir)/chalk/core \
-	-I$(top_srcdir)/chalk/chalkcolor/ \
-	-I$(top_srcdir)/chalk/ui \
-	$(KROSS_INCLUDES) \
-	$(KOFFICE_INCLUDES) \
-	$(all_includes)
-
-
-lib_LTLIBRARIES = libchalkscripting.la
-libchalkscripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp
-noinst_HEADERS = kis_script_progress.h
-
-libchalkscripting_la_LDFLAGS = -no-undefined $(all_libraries)
-libchalkscripting_la_LIBADD =  $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la
-
-KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-
-libchalkscripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
deleted file mode 100644
index 3967ffe7..00000000
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Library General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kis_script_monitor.h"
-
-#include <main/scriptaction.h>
-#include <main/scriptguiclient.h>
-
-
-KisScriptMonitor::KisScriptMonitor()
-{
-}
-
-
-KisScriptMonitor::~KisScriptMonitor()
-{
-    s_instance = 0;
-}
-
-void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient)
-{
-    connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )));
-    connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )));
-}
-
-KisScriptMonitor* KisScriptMonitor::s_instance = 0;
-
-KisScriptMonitor* KisScriptMonitor::instance()
-{
-    if(s_instance == 0)
-        s_instance = new KisScriptMonitor();
-    return s_instance;
-}
-
-#include "kis_script_monitor.moc"
-
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h
deleted file mode 100644
index b2495d8b..00000000
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Library General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef KIS_SCRIPT_MONITOR_H
-#define KIS_SCRIPT_MONITOR_H
-
-#include <tqobject.h>
-
-namespace Kross {
-    namespace Api {
-        class ScriptGUIClient;
-        class ScriptAction;
-    }
-}
-
-/**
-	@author Cyrille Berger <cberger@cberger.net>
-*/
-class KisScriptMonitor : public TQObject {
-    Q_OBJECT
-  
-    private:
-        KisScriptMonitor();
-        ~KisScriptMonitor();
-    public:
-        static KisScriptMonitor* instance();
-        void monitor(Kross::Api::ScriptGUIClient* guiClient);
-    signals:
-        void executionFinished(const Kross::Api::ScriptAction* );
-        void executionStarted(const Kross::Api::ScriptAction* );
-    private:
-        static KisScriptMonitor* s_instance;
-
-};
-
-#endif
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp
deleted file mode 100644
index d7af4eb4..00000000
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- *  Copyright (c) 2005 Cyrille Berger <cberger@cberger.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Library General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "kis_script_progress.h"
-
-#include <kis_progress_display_interface.h>
-#include <kis_view.h>
-
-void KisScriptProgress::activateAsSubject()
-{
-    m_view->canvasSubject()->progressDisplay()->setSubject( this, true, false /* TODO: how to cancel a script ? */ );
-}
-
-void KisScriptProgress::setProgressTotalSteps(TQ_INT32 totalSteps)
-{
-    m_progressTotalSteps = totalSteps;
-    m_progressSteps = 0;
-    m_lastProgressPerCent = 0;
-    emit notifyProgress(0);
-}
-
-void KisScriptProgress::setProgress(TQ_INT32 progress)
-{
-    m_progressSteps = progress;
-    TQ_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1);
-
-    if (progressPerCent != m_lastProgressPerCent) {
-
-        m_lastProgressPerCent = progressPerCent;
-        emit notifyProgress(progressPerCent);
-    }
-}
-
-void KisScriptProgress::incProgress()
-{
-    setProgress( ++m_progressSteps );
-}
-
-void KisScriptProgress::setProgressStage(const TQString& stage, TQ_INT32 progress)
-{
-    TQ_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1);
-    m_lastProgressPerCent = progress;
-    emit notifyProgressStage( stage, progressPerCent);
-}
-
-void KisScriptProgress::progressDone()
-{
-    emit notifyProgressDone();
-}
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h
deleted file mode 100644
index 48af433c..00000000
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Copyright (c) 2005 Cyrille Berger <cberger@cberger.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Library General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#ifndef _KIS_SCRIPT_PROGRESS_H_
-#define _KIS_SCRIPT_PROGRESS_H_
-
-#include <kis_progress_subject.h>
-
-class KisView;
-
-/**
- * TODO: clarify the situation, while, in the future, multiple scripts could be running at a same time,
- * some of the functions are global to all script and some aren't.
- */
-class KisScriptProgress : public KisProgressSubject
-{
-    public:
-        KisScriptProgress(KisView* view) : m_view(view) {};
-    public:
-        /**
-         * This function will set this class as the KisProgressSubject in view
-         */
-        void activateAsSubject();
-        virtual void cancel() {};
-    public:
-        void setProgressTotalSteps(TQ_INT32 totalSteps);
-        void setProgress(TQ_INT32 progress);
-        void incProgress();
-        void setProgressStage(const TQString& stage, TQ_INT32 progress);
-        void progressDone();
-        inline void setPackagePath(TQString path) { m_packagePath = path; };
-        inline TQString packagePath() { return m_packagePath; }
-    private:
-        TQ_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent;
-        KisView * m_view;
-        TQString m_packagePath;
-};
-
-#endif