diff options
Diffstat (limited to 'quanta')
35 files changed, 14 insertions, 96 deletions
diff --git a/quanta/components/csseditor/Makefile.am b/quanta/components/csseditor/Makefile.am index 3b888e32..d10c36b8 100644 --- a/quanta/components/csseditor/Makefile.am +++ b/quanta/components/csseditor/Makefile.am @@ -14,5 +14,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/src \ -I$(top_srcdir)/quanta/parsers \ -I$(top_srcdir)/quanta/project \ -I$(top_srcdir)/lib \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) noinst_HEADERS = styleeditor.h diff --git a/quanta/components/cvsservice/Makefile.am b/quanta/components/cvsservice/Makefile.am index b33f1ea0..6b72c440 100644 --- a/quanta/components/cvsservice/Makefile.am +++ b/quanta/components/cvsservice/Makefile.am @@ -11,5 +11,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/src \ -I$(top_srcdir)/quanta/parsers \ -I$(top_srcdir)/quanta/project \ -I$(top_srcdir)/lib \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) noinst_HEADERS = cvsservicedcopif.h diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 4035ed2f..3f21c81b 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -25,7 +25,6 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kcombobox.h> -#include <tdeversion.h> #include <kiconloader.h> #include <klineedit.h> #include <tdelistbox.h> diff --git a/quanta/components/debugger/Makefile.am b/quanta/components/debugger/Makefile.am index f24e455d..6c2a357b 100644 --- a/quanta/components/debugger/Makefile.am +++ b/quanta/components/debugger/Makefile.am @@ -21,5 +21,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/components/debuggerquanta \ -I$(top_srcdir)/quanta/parts/preview \ -I$(top_srcdir)/quanta/messages \ -I$(top_srcdir)/lib \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) noinst_HEADERS = pathmapper.h backtracelistview.h diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 1e02305f..356b88b0 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -19,7 +19,6 @@ #include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <tdeversion.h> #include <tdelistview.h> // Quanta includes diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index f4204ec2..cecd4faa 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -16,7 +16,6 @@ #include <errno.h> #include <kdebug.h> -#include <tdeversion.h> #include <kgenericfactory.h> #include <tdelocale.h> #include <kmdcodec.h> diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 140ee4b7..9c2a7486 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -19,7 +19,6 @@ #include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <tdeversion.h> #include <kinputdialog.h> #include <tdelistview.h> diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 086ff878..fb6f086a 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -23,7 +23,6 @@ #include <tqslider.h> #include <tqcheckbox.h> #include <tqcombobox.h> -#include <tdeversion.h> #include <errno.h> #include <tqstring.h> #include <tqmap.h> diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 8fc97aaf..c095706f 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -19,7 +19,6 @@ #include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <tdeversion.h> #include <kinputdialog.h> #include <tqclipboard.h> diff --git a/quanta/components/tableeditor/Makefile.am b/quanta/components/tableeditor/Makefile.am index 242fae89..d5da72d0 100644 --- a/quanta/components/tableeditor/Makefile.am +++ b/quanta/components/tableeditor/Makefile.am @@ -10,6 +10,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \ -I$(top_srcdir)/quanta/src \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/quanta/components/tableeditor \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) noinst_HEADERS = tableeditor.h tableitem.h diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h index 2cbe8a5c..74019bbf 100644 --- a/quanta/components/tableeditor/tableitem.h +++ b/quanta/components/tableeditor/tableitem.h @@ -18,7 +18,6 @@ #define TABLEITEM_H #include <tqtable.h> -#include <tdeversion.h> class TableItem : public TQTableItem { diff --git a/quanta/dialogs/Makefile.am b/quanta/dialogs/Makefile.am index 9a63dd23..89bc98e5 100644 --- a/quanta/dialogs/Makefile.am +++ b/quanta/dialogs/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib \ -I$(top_srcdir)/quanta/utility \ -I$(top_srcdir)/quanta/parsers \ -I$(top_srcdir)/quanta/src \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) SUBDIRS = settings tagdialogs diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index 4ab5dd98..e6155901 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -38,7 +38,6 @@ #include <tdepopupmenu.h> #include <kpushbutton.h> #include <tdestandarddirs.h> -#include <tdeversion.h> #include <kinputdialog.h> #include <tdetoolbar.h> diff --git a/quanta/dialogs/tagdialogs/Makefile.am b/quanta/dialogs/tagdialogs/Makefile.am index ac7fd23f..d5e022a7 100644 --- a/quanta/dialogs/tagdialogs/Makefile.am +++ b/quanta/dialogs/tagdialogs/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \ -I$(top_srcdir)/quanta/src \ -I$(top_srcdir)/quanta/parts/kafka \ -I$(top_srcdir)/lib \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) METASOURCES = AUTO diff --git a/quanta/parsers/Makefile.am b/quanta/parsers/Makefile.am index ef11528d..ddb01cc1 100644 --- a/quanta/parsers/Makefile.am +++ b/quanta/parsers/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \ -I$(top_srcdir)/quanta/parts/kafka \ -I$(top_srcdir)/quanta/treeviews \ -I$(top_srcdir)/lib \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) noinst_HEADERS = saparser.h parsercommon.h sagroupparser.h diff --git a/quanta/parts/Makefile.am b/quanta/parts/Makefile.am index 87e1bfc1..6cd2b3d0 100644 --- a/quanta/parts/Makefile.am +++ b/quanta/parts/Makefile.am @@ -1,8 +1,2 @@ -#This line is required for KDevelop -#tdevelop: KAFKA_SUBDIR=kafka - -if BUILD_WYSIWYG - KAFKA_SUBDIR=kafka -endif -SUBDIRS = preview $(KAFKA_SUBDIR) +SUBDIRS = preview kafka diff --git a/quanta/parts/kafka/configure.in.in b/quanta/parts/kafka/configure.in.in deleted file mode 100644 index 418c4554..00000000 --- a/quanta/parts/kafka/configure.in.in +++ /dev/null @@ -1,42 +0,0 @@ -build_vpl="yes" - -#build_vpl="no" -AC_DEFUN([QUANTA_CHECK_VPL], -[ - AC_MSG_CHECKING(whether VPL can be compiled) - AC_CACHE_VAL(ac_cv_vpl_setup, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$KDE_INCLUDES $TQT_INCLUDES" - - AC_TRY_LINK([ - #include <tdeversion.h> - ], - [ - #if TDE_VERSION < ((3<<16) | (1<<8) | (90)) - KDE_choke me - #endif - ], - ac_cv_vpl_setup=yes, - ac_cv_vpl_setup=no - ) - CXXFLAGS="$save_CXXFLAGS" - AC_LANG_RESTORE - ]) - - if test "$ac_cv_vpl_setup" = "yes"; then - build_vpl="yes" - CXXFLAGS="$CXXFLAGS -DBUILD_KAFKAPART" - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi - -]) - -#QUANTA_CHECK_VPL - -AM_CONDITIONAL(BUILD_WYSIWYG, test "$build_vpl" = "yes") - diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 2de57fbf..741fda4f 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -22,7 +22,6 @@ //kde includes #include <tdeconfig.h> #include <kdebug.h> -#include <tdeversion.h> #include <tdehtml_settings.h> #include <tdehtmlview.h> #include <tdelocale.h> diff --git a/quanta/plugins/Makefile.am b/quanta/plugins/Makefile.am index bdbdd141..c8f0941a 100644 --- a/quanta/plugins/Makefile.am +++ b/quanta/plugins/Makefile.am @@ -10,6 +10,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \ -I$(top_srcdir)/quanta/project \ -I$(top_srcdir)/quanta/messages \ -I$(top_srcdir)/lib \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) diff --git a/quanta/project/Makefile.am b/quanta/project/Makefile.am index f9a4248f..9eb648e1 100644 --- a/quanta/project/Makefile.am +++ b/quanta/project/Makefile.am @@ -20,7 +20,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \ -I$(top_srcdir)/quanta/components/debugger \ -I$(top_srcdir)/quanta/components/debugger/interfaces \ -I$(top_builddir)/quanta/dialogs \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) noinst_HEADERS = teammembersdlg.h membereditdlg.h eventconfigurationdlg.h \ eventeditordlg.h diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 1503b951..dfa467c9 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -32,7 +32,6 @@ #include <tdemessagebox.h> #include <kurl.h> #include <kprotocolinfo.h> -#include <tdeversion.h> //app includes #include "projectnewgeneral.h" diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 6964b030..8862db00 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -31,7 +31,6 @@ #include <tdefiledialog.h> #include <kprogress.h> #include <kmimetype.h> -#include <tdeversion.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h index 54871a6c..5624f222 100644 --- a/quanta/project/projectoptions.ui.h +++ b/quanta/project/projectoptions.ui.h @@ -17,7 +17,6 @@ #include <kcombobox.h> #include <tdefiledialog.h> -#include <tdeversion.h> #include <tdemessagebox.h> #include <tdelocale.h> diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am index 82ba1b03..19a5651d 100644 --- a/quanta/src/Makefile.am +++ b/quanta/src/Makefile.am @@ -1,7 +1,5 @@ -if BUILD_WYSIWYG LIB_KAFKA = $(top_builddir)/quanta/parts/kafka/libkafkalibrary.la KAFKAINCLUDE = -I$(top_srcdir)/quanta/parts/kafka -I$(top_builddir)/quanta/parts/kafka -endif if include_cvsservice CVSSERVICE_INCLUDE = -I$(top_srcdir)/quanta/components/cvsservice @@ -30,7 +28,7 @@ quanta_LDADD = $(top_builddir)/quanta/project/libproject.la \ $(top_builddir)/quanta/utility/libutility.la \ $(top_builddir)/lib/libquantamodule.la \ -lkatepartinterfaces $(LIB_TDENEWSTUFF) $(LIB_KAFKA) $(LIB_CVSSERVICE) \ - $(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_TDEABC) $(LIB_TDESPELL) $(LIB_TDEHTML) -lX11 -ltdefx + -ltdemdi $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_TDEABC) $(LIB_TDESPELL) $(LIB_TDEHTML) -lX11 -ltdefx # $(top_builddir)/lib/compatibility/libcompat.la AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \ @@ -57,7 +55,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \ -I$(top_builddir)/quanta/components/framewizard \ -I$(top_builddir)/quanta/components/tableeditor \ -I$(top_builddir)/quanta/plugins \ - $(KAFKAINCLUDE) $(CVSSERVICE_INCLUDE) $(KMDI_INCLUDES) \ + $(KAFKAINCLUDE) $(CVSSERVICE_INCLUDE) \ $(KNEWSTUFF_INCLUDES) $(all_includes) # -I$(top_srcdir)/lib/compatibility diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index d5be6159..b6a2ff72 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -28,7 +28,6 @@ #include <tdeglobalsettings.h> #include <ksplashscreen.h> #include <dcopclient.h> -#include <tdeversion.h> #include "config.h" #include "quantacommon.h" diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 830de874..5d7f7434 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -68,7 +68,6 @@ #include <tdeconfig.h> #include <tdehtmlview.h> #include <kdialogbase.h> -#include <tdeversion.h> #include <kkeydialog.h> #include <kinputdialog.h> #include <klibloader.h> diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index 0124c9fc..a6c6fee4 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -38,7 +38,6 @@ #include <tqptrlist.h> // include files for KDE -#include <tdeversion.h> #include <kdockwidget.h> #include <tdeparts/browserextension.h> #include <tdeparts/dockmainwindow.h> diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index b77e2341..124af638 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -33,7 +33,6 @@ #include <tdepopupmenu.h> #include <tdemessagebox.h> #include <kdirwatch.h> -#include <tdeversion.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index cffc125a..7bb435cf 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -42,7 +42,6 @@ #include <kiconloader.h> #include <tdemessagebox.h> #include <kurldrag.h> -#include <tdeversion.h> #include <tdeparts/partmanager.h> #include <kstatusbar.h> diff --git a/quanta/treeviews/Makefile.am b/quanta/treeviews/Makefile.am index 11660304..a6d0e437 100644 --- a/quanta/treeviews/Makefile.am +++ b/quanta/treeviews/Makefile.am @@ -21,5 +21,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/utility \ -I$(top_builddir)/quanta/dialogs/tagdialogs \ -I$(top_builddir)/quanta/components/csseditor \ -I$(top_srcdir)/quanta/plugins \ - $(KMDI_INCLUDES) $(CVSSERVICE_INCLUDE) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes) + $(CVSSERVICE_INCLUDE) $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes) CXXFLAGS += $(ICU_CXXFLAGS) diff --git a/quanta/utility/Makefile.am b/quanta/utility/Makefile.am index 56522430..dbabd0bd 100644 --- a/quanta/utility/Makefile.am +++ b/quanta/utility/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/src \ -I$(top_srcdir)/quanta/project \ -I$(top_srcdir)/lib \ $(KNEWSTUFF_INCLUDES) \ - $(KMDI_INCLUDES) $(all_includes) + $(all_includes) libutility_la_LDFLAGS = $(all_libraries) noinst_HEADERS = qpevents.h tagactionmanager.h tagactionset.h diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h index b341d6ac..b98be802 100644 --- a/quanta/utility/quantacommon.h +++ b/quanta/utility/quantacommon.h @@ -16,8 +16,6 @@ #ifndef QUANTACOMMON_H #define QUANTACOMMON_H -#include <tdeversion.h> - #include "qtag.h" #include "node.h" #include "parser.h" diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 5b620852..62e01c36 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -92,12 +92,8 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo setIcon(s); m_file = 0L; loopStarted = false; -#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); -#else - connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated())); -#endif connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool))); connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages())); connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView())); @@ -113,7 +109,6 @@ TQString TagAction::type() return tag.attribute("type",""); } -#if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::ButtonState /*state*/) { QuantaView *view = ViewManager::ref()->activeView(); @@ -485,12 +480,6 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But } return true; } -#else - // hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains - // of no matching function. -bool TagAction::slotActionActivated(TDEAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/) -{return true;} -#endif bool TagAction::slotActionActivated() { diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index 783665e3..f2e0aa78 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -18,7 +18,6 @@ #ifndef TAGACTION_H #define TAGACTION_H -#include <tdeversion.h> #include <tdeaction.h> #include <tdeactioncollection.h> diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index e23145e3..789e8439 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -25,7 +25,6 @@ //kde includes #include <tdeaction.h> #include <tdeaccelmanager.h> -#include <tdeversion.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> |