summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2009-03-16 00:01:28 +0100
committerDennis kasprzyk <onestone@compiz-fusion.org>2009-03-16 00:01:28 +0100
commitaaa1ea1d80873aea6533346199b724550667142b (patch)
treed8c431a31db14e5ccf018796f6ec8df9198a5cc1
parent975650f1a276f351aaf50ec6dd692629efbab114 (diff)
downloadmobileperf-aaa1ea1d80873aea6533346199b724550667142b.tar.gz
mobileperf-aaa1ea1d80873aea6533346199b724550667142b.tar.bz2
Drop CompMetadata.
-rw-r--r--include/compiz.h3
-rw-r--r--include/core/CMakeLists.txt1
-rw-r--r--include/core/core.h1
-rw-r--r--include/core/screen.h2
-rw-r--r--legacy/metadata.cpp (renamed from src/metadata.cpp)0
-rw-r--r--legacy/metadata.h (renamed from include/core/metadata.h)0
-rw-r--r--legacy/privatemetadata.h (renamed from src/privatemetadata.h)0
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/main.cpp6
9 files changed, 3 insertions, 11 deletions
diff --git a/include/compiz.h b/include/compiz.h
index 4f8f774..08acef4 100644
--- a/include/compiz.h
+++ b/include/compiz.h
@@ -31,6 +31,9 @@
#include <string>
#include <list>
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY (x)
+
#define RESTRICT_VALUE(value, min, max) \
(((value) < (min)) ? (min): ((value) > (max)) ? (max) : (value))
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
index 565e1c2..50788e9 100644
--- a/include/core/CMakeLists.txt
+++ b/include/core/CMakeLists.txt
@@ -4,7 +4,6 @@ set (_headers
core.h
icon.h
match.h
- metadata.h
option.h
output.h
plugin.h
diff --git a/include/core/core.h b/include/core/core.h
index 2937a35..bff0646 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -71,7 +71,6 @@ typedef XBool Bool;
#include <core/window.h>
#include <core/plugin.h>
#include <core/option.h>
-#include <core/metadata.h>
#include <core/action.h>
#include <core/icon.h>
#include <core/match.h>
diff --git a/include/core/screen.h b/include/core/screen.h
index ea58bf7..a076b42 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -31,7 +31,6 @@
#include <core/window.h>
#include <core/output.h>
#include <core/session.h>
-#include <core/metadata.h>
#include <core/plugin.h>
#include <core/match.h>
#include <core/pluginclasses.h>
@@ -48,7 +47,6 @@ extern bool noDetection;
extern bool debugOutput;
extern CompScreen *screen;
-extern CompMetadata *coreMetadata;
extern int lastPointerX;
extern int lastPointerY;
diff --git a/src/metadata.cpp b/legacy/metadata.cpp
index cf2f30c..cf2f30c 100644
--- a/src/metadata.cpp
+++ b/legacy/metadata.cpp
diff --git a/include/core/metadata.h b/legacy/metadata.h
index 49cb0a8..49cb0a8 100644
--- a/include/core/metadata.h
+++ b/legacy/metadata.h
diff --git a/src/privatemetadata.h b/legacy/privatemetadata.h
index cbd5a87..cbd5a87 100644
--- a/src/privatemetadata.h
+++ b/legacy/privatemetadata.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62081cd..e10e620 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,7 +33,6 @@ add_executable (compiz
actions.cpp
screen.cpp
window.cpp
- metadata.cpp
action.cpp
option.cpp
string.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 6e2c5db..2bed44d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -183,10 +183,6 @@ main (int argc, char **argv)
}
}
- xmlInitParser ();
-
- LIBXML_TEST_VERSION;
-
screen = new CompScreen();
if (!screen)
@@ -223,8 +219,6 @@ main (int argc, char **argv)
delete screen;
- xmlCleanupParser ();
-
if (restartSignal)
{
execvp (programName, programArgv);