[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/libs/taskmanager
From: Carlo Segato <brandon.ml () gmail ! com>
Date: 2010-04-23 12:38:26
Message-ID: 20100423123826.52A51AC8A0 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1117913 by segato:
better separation between x11 and windows code
M +6 -0 CMakeLists.txt
M +1 -62 task.cpp
A task_p.h [License: BSD X11 (BSD like)]
M +4 -0 task_win.cpp
M +4 -0 task_x11.cpp
--- trunk/KDE/kdebase/workspace/libs/taskmanager/CMakeLists.txt #1117912:1117913
@@ -23,6 +23,12 @@
taskmanager.cpp
)
+if(WIN32)
+ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_win.cpp)
+else(WIN32)
+ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp)
+endif(WIN32)
+
kde4_add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
target_link_libraries(taskmanager ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
--- trunk/KDE/kdebase/workspace/libs/taskmanager/task.cpp #1117912:1117913
@@ -24,85 +24,24 @@
// Own
#include "task.h"
+#include "task_p.h"
// Qt
#include <QMimeData>
-#include <QTime>
#include <QTimer>
#include <QApplication>
#include <QDesktopWidget>
-#ifdef Q_WS_X11
-#include <QX11Info>
-#endif
-
-#ifdef Q_WS_WIN
-#include <windows.h>
-#endif
-
// KDE
#include <KDebug>
#include <KIconLoader>
#include <KLocale>
-#include <NETWinInfo>
#include "taskmanager.h"
namespace TaskManager
{
-static const unsigned long windowInfoFlags = NET::WMState | NET::XAWMState | NET::WMDesktop |
- NET::WMVisibleName | NET::WMGeometry |
- NET::WMWindowType | NET::WM2AllowedActions;
-static const unsigned long windowInfoFlags2 = NET::WM2AllowedActions;
-
-class Task::Private
-{
-public:
- Private(WId w)
- : win(w),
- frameId(w),
- info(KWindowSystem::windowInfo(w, windowInfoFlags, windowInfoFlags2)),
- lastWidth(0),
- lastHeight(0),
- cachedChanges(0),
- cachedChangesTimerId(0),
- active(false),
- lastResize(false)
- {
- }
-
- WId win;
- WId frameId;
- KWindowInfo info;
- WindowList transients;
- WindowList transientsDemandingAttention;
-
- int lastWidth;
- int lastHeight;
- QIcon icon;
-
- QRect iconGeometry;
-
- QTime lastUpdate;
- unsigned int cachedChanges;
- int cachedChangesTimerId;
- QPixmap pixmap;
- QPixmap lastIcon;
- bool active : 1;
- bool lastResize : 1;
-};
-}
-
-#if defined Q_WS_WIN
-# include "task_win.cpp"
-#else
-# include "task_x11.cpp"
-#endif
-
-namespace TaskManager
-{
-
Task::Task(WId w, QObject *parent, const char *name)
: QObject(parent),
d(new Private(w))
--- trunk/KDE/kdebase/workspace/libs/taskmanager/task_win.cpp #1117912:1117913
@@ -21,7 +21,11 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
+#include "task_p.h"
+#include <windows.h>
+
+
namespace TaskManager
{
--- trunk/KDE/kdebase/workspace/libs/taskmanager/task_x11.cpp #1117912:1117913
@@ -22,6 +22,10 @@
******************************************************************/
+#include "task_p.h"
+
+#include <QX11Info>
+
namespace TaskManager
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic