From 3d07ef1d0caeb6231ea33a4b2f4f9b0790f12683 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 27 Nov 2011 11:51:45 +0100 Subject: [PATCH] directfb: Move the macro to the qdirectfbconvenience header file MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We will need to have logging outside of the blitter code, make the macro available to everyone. Change-Id: I811ecb98a870a818630276b5daa788790db71ccd Reviewed-by: Jørgen Lind --- src/plugins/platforms/directfb/qdirectfbblitter.cpp | 5 ----- src/plugins/platforms/directfb/qdirectfbconvenience.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/platforms/directfb/qdirectfbblitter.cpp b/src/plugins/platforms/directfb/qdirectfbblitter.cpp index f7a1327..0d2fc84 100644 --- a/src/plugins/platforms/directfb/qdirectfbblitter.cpp +++ b/src/plugins/platforms/directfb/qdirectfbblitter.cpp @@ -50,11 +50,6 @@ #include -#define QDFB_STRINGIFY(x) #x -#define QDFB_TOSTRING(x) QDFB_STRINGIFY(x) -#define QDFB_PRETTY \ - (__FILE__ ":" QDFB_TOSTRING(__LINE__)) - static QBlittable::Capabilities dfb_blitter_capabilities() { return QBlittable::Capabilities(QBlittable::SolidRectCapability diff --git a/src/plugins/platforms/directfb/qdirectfbconvenience.h b/src/plugins/platforms/directfb/qdirectfbconvenience.h index db73b0c..f6a913e 100644 --- a/src/plugins/platforms/directfb/qdirectfbconvenience.h +++ b/src/plugins/platforms/directfb/qdirectfbconvenience.h @@ -114,4 +114,10 @@ public: QDirectFbScreen *toDfbScreen(QWindow *window); IDirectFBDisplayLayer *toDfbLayer(QPlatformScreen *screen); +#define QDFB_STRINGIFY(x) #x +#define QDFB_TOSTRING(x) QDFB_STRINGIFY(x) +#define QDFB_PRETTY \ + (__FILE__ ":" QDFB_TOSTRING(__LINE__)) + + #endif // QDIRECTFBCONVENIENCE_H -- 2.7.4