summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Goldberg <george.goldberg@collabora.co.uk>2009-09-02 12:27:42 (GMT)
committerGeorge Goldberg <george.goldberg@collabora.co.uk>2009-09-02 12:27:42 (GMT)
commite0b910edc0d5b868d9940d53b810c394d227bd26 (patch)
treed03b543c7acf19ec3e3c841f54157db058bfaafb
parent086bf9eebfff430134a1ed8a378634784d2a341f (diff)
downloadkrfb-telepathy-e0b910edc0d5b868d9940d53b810c394d227bd26.tar.gz
krfb-telepathy-e0b910edc0d5b868d9940d53b810c394d227bd26.tar.xz
Minor fixes to the framebuffer plugin management. Includes defaulting to the Qt frame buffer.
-rw-r--r--framebuffermanager.cpp5
-rw-r--r--framebufferplugin.cpp2
-rw-r--r--framebufferplugin.h3
-rw-r--r--framebuffers/CMakeLists.txt2
4 files changed, 8 insertions, 4 deletions
diff --git a/framebuffermanager.cpp b/framebuffermanager.cpp
index f4cfcc4..1df4e6b 100644
--- a/framebuffermanager.cpp
+++ b/framebuffermanager.cpp
@@ -101,8 +101,10 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
QSharedPointer<FrameBuffer> strongFrameBuffer = weakFrameBuffer.toStrongRef();
if (strongFrameBuffer) {
+ kDebug() << "Found cached frame buffer:" << strongFrameBuffer.data();
return strongFrameBuffer;
} else {
+ kDebug() << "Found deleted cached frame buffer. Don't use.";
m_frameBuffers.remove(id);
}
}
@@ -112,7 +114,7 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
while (iter != m_plugins.constEnd()) {
// FIXME: Use KConfig to chose which type to use.
- if (iter.key() == "QtFrameBuffer") {
+ if (iter.key() == "krfb_framebuffer_qt") {
kDebug() << "Using Qt FrameBuffer";
QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id));
@@ -128,6 +130,7 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id)
}
// No valid framebuffer plugin found.
+ kDebug() << "No valid framebuffer found. returning null.";
return QSharedPointer<FrameBuffer>();
}
diff --git a/framebufferplugin.cpp b/framebufferplugin.cpp
index b523edd..31bf3b3 100644
--- a/framebufferplugin.cpp
+++ b/framebufferplugin.cpp
@@ -21,7 +21,7 @@
#include "framebuffer.h"
-FrameBufferPlugin::FrameBufferPlugin(QObject *parent)
+FrameBufferPlugin::FrameBufferPlugin(QObject *parent, const QVariantList &)
: QObject(parent)
{
}
diff --git a/framebufferplugin.h b/framebufferplugin.h
index 7690c96..11ca33c 100644
--- a/framebufferplugin.h
+++ b/framebufferplugin.h
@@ -22,6 +22,7 @@
#include <kdemacros.h>
+#include <QtCore/QVariantList>
#include <QtGui/QWidget>
class FrameBuffer;
@@ -31,7 +32,7 @@ class KDE_EXPORT FrameBufferPlugin : public QObject
Q_OBJECT
public:
- FrameBufferPlugin(QObject *parent = 0);
+ FrameBufferPlugin(QObject *parent, const QVariantList &args);
virtual ~FrameBufferPlugin();
virtual FrameBuffer *frameBuffer(WId id) = 0;
diff --git a/framebuffers/CMakeLists.txt b/framebuffers/CMakeLists.txt
index 32f42c3..96ccd60 100644
--- a/framebuffers/CMakeLists.txt
+++ b/framebuffers/CMakeLists.txt
@@ -1,3 +1,3 @@
add_subdirectory (qt)
-add_subdirectory (x11)
+# add_subdirectory (x11)