summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-24 21:12:08 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-08-24 21:12:08 +0000
commitf8fb0a6b61511cee7d2001dd781e0bfaf934b690 (patch)
tree336f1202ad019d437c19fd5c030e2fca97b16666 /korganizer
parentc437f19f371b5678e0772a5f922fc3587864ca4e (diff)
downloadtdepim-f8fb0a6b61511cee7d2001dd781e0bfaf934b690.tar.gz
tdepim-f8fb0a6b61511cee7d2001dd781e0bfaf934b690.zip
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
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/Makefile.am2
-rw-r--r--korganizer/kocore.cpp12
-rw-r--r--korganizer/kocore.h3
-rw-r--r--korganizer/koeditorgeneral.cpp6
4 files changed, 4 insertions, 19 deletions
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 8b6e4d91e..c25f3c5a4 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 d5ed4f39b..b9d404e70 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 1d6a4ebe6..f28382635 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 26ec5a517..816806e3a 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);
}