Moved the editor open variable out of kocore to remove accidental compilation circular dependency

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1167544 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 4 insertions, 19 deletions

diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 8b6e4d91..c25f3c5a 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
 
 bin_PROGRAMS = korganizer
 
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkcal
 korganizer_LDADD   = libkorganizer.la
 korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
 korganizer_COMPILE_FIRST = koprefs_base.h
diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp
index d5ed4f39..b9d404e7 100644
--- a/korganizer/kocore.cpp
+++ b/korganizer/kocore.cpp
@@ -41,8 +41,6 @@
 
 #include <tqwidget.h>
 
-static bool m_editoropen = false;
-
 KOCore *KOCore::mSelf = 0;
 
 KOCore *KOCore::self()
@@ -64,16 +62,6 @@ KOCore::~KOCore()
   mSelf = 0;
 }
 
-bool KOCore::editorWindowOpen()
-{
-  return m_editoropen;
-}
-
-void KOCore::setEditorWindowOpen(bool open)
-{
-  m_editoropen = open;
-}
-
 KTrader::OfferList KOCore::availablePlugins( const TQString &type, int version )
 {
   TQString constraint;
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index 1d6a4ebe..f2838263 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -84,9 +84,6 @@ class KDE_EXPORT KOCore
 
     KPIM::IdentityManager* identityManager();
 
-    bool editorWindowOpen();
-    void setEditorWindowOpen(bool open);
-
   protected:
     KOCore();
 
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 26ec5a51..816806e3 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -54,13 +54,13 @@
 
 #include <libkcal/todo.h>
 #include <libkcal/event.h>
+#include <libkcal/resourcecached.h>
 
 #include <libkdepim/kdateedit.h>
 #include <libkdepim/categoryselectdialog.h>
 
 #include "koprefs.h"
 #include "koglobals.h"
-#include "kocore.h"
 
 #include "koeditorgeneral.h"
 #include "koeditoralarms.h"
@@ -71,13 +71,13 @@
 KOEditorGeneral::KOEditorGeneral(TQObject* parent, const char* name) :
   TQObject( parent, name ), mAttachments(0)
 {
-  KOCore::self()->setEditorWindowOpen(true);
+  ResourceCached::setEditorWindowOpen(true);
   mAlarmList.setAutoDelete( true );
 }
 
 KOEditorGeneral::~KOEditorGeneral()
 {
-  KOCore::self()->setEditorWindowOpen(false);
+  ResourceCached::setEditorWindowOpen(false);
 }