[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/kicker/applets/minipager
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2007-06-24 17:22:22
Message-ID: 1182705742.848145.685.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 679707 by hausmann:

Some work on making it compile, still not there though


 M  +12 -12    pagerapplet.cpp  
 M  +3 -3      pagerapplet.h  
 M  +1 -1      pagerbutton.h  


--- trunk/KDE/kdebase/workspace/kicker/applets/minipager/pagerapplet.cpp \
#679706:679707 @@ -81,13 +81,13 @@
     KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
     {
       KGlobal::locale()->insertCatalog("kminipagerapplet");
-      return new KMiniPager(configFile, Plasma::Normal, 0, parent, \
"kminipagerapplet"); +      return new KMiniPager(configFile, Plasma::Normal, 0, \
parent);  }
 }
 
 KMiniPager::KMiniPager(const QString& configFile, Plasma::Type type, int actions,
-                       QWidget *parent, const char *name)
-    : KPanelApplet( configFile, type, actions, parent, name ),
+                       QWidget *parent)
+    : KPanelApplet( configFile, type, actions, parent),
       m_layout(0),
       m_desktopLayoutOwner( NULL ),
       m_shadowEngine(0),
@@ -98,7 +98,7 @@
     QRect desk = QApplication::desktop()->screenGeometry(scnum);
     if (desk.width() <= 800)
     {
-        KConfigSkeleton::ItemInt* item = \
dynamic_cast<KConfigSkeleton::ItemBool*>(m_settings->findItem("Preview")); +        \
KConfigSkeleton::ItemBool* item = \
dynamic_cast<KConfigSkeleton::ItemBool*>(m_settings->findItem("Preview"));  if (item)
         {
             item->setDefaultValue(false);
@@ -475,8 +475,8 @@
 {
     if (desktopPreview())
     {
-        KWindowSystem::WindowInfo* inf1 = m_activeWindow ? info( m_activeWindow ) : \
                NULL;
-        KWindowSystem::WindowInfo* inf2 = win ? info( win ) : NULL;
+        KWindowInfo* inf1 = m_activeWindow ? info( m_activeWindow ) : NULL;
+        KWindowInfo* inf2 = win ? info( win ) : NULL;
         m_activeWindow = win;
 
         QList<KMiniPagerButton*>::ConstIterator it;
@@ -496,7 +496,7 @@
 {
     if (desktopPreview())
     {
-        KWindowSystem::WindowInfo* inf = info( win );
+        KWindowInfo* inf = info( win );
 
         if (inf->state() & NET::SkipPager)
         {
@@ -519,7 +519,7 @@
 {
     if (desktopPreview())
     {
-        KWindowSystem::WindowInfo* inf = info(win);
+        KWindowInfo* inf = info(win);
         bool onAllDesktops = inf->onAllDesktops();
         bool skipPager = inf->state() & NET::SkipPager;
         int desktop = inf->desktop();
@@ -564,7 +564,7 @@
 
     if (desktopPreview())
     {
-        KWindowSystem::WindowInfo* inf = m_windows[win];
+        KWindowInfo* inf = m_windows[win];
         bool onAllDesktops = inf ? inf->onAllDesktops() : false;
         bool skipPager = inf ? inf->state() & NET::SkipPager : false;
         int desktop = inf ? inf->desktop() : 0;
@@ -593,11 +593,11 @@
     }
 }
 
-KWindowSystem::WindowInfo* KMiniPager::info( WId win )
+KWindowInfo* KMiniPager::info( WId win )
 {
     if (!m_windows[win] )
     {
-        KWindowSystem::WindowInfo* info = new KWindowSystem::WindowInfo( win,
+        KWindowInfo* info = new KWindowInfo( win,
             NET::WMWindowType | NET::WMState | NET::XAWMState | NET::WMDesktop | \
NET::WMGeometry | NET::WMFrameExtents, 0 );  
         m_windows.insert( (long) win, info );
@@ -640,7 +640,7 @@
     m_contextMenu->addSeparator();
 
     m_contextMenu->insertItem(i18n("&Rename Desktop \"%1\"",
-                                    kwin()->desktopName(m_rmbDesk)), RenameDesktop);
+                                    KWindowSystem::desktopName(m_rmbDesk)), \
RenameDesktop);  m_contextMenu->addSeparator();
 
     KMenu* showMenu = new KMenu(m_contextMenu);
--- trunk/KDE/kdebase/workspace/kicker/applets/minipager/pagerapplet.h #679706:679707
@@ -52,14 +52,14 @@
 
 public:
     KMiniPager(const QString& configFile, Plasma::Type t = Plasma::Normal, int \
                actions = 0,
-               QWidget *parent = 0, const char *name = 0);
+               QWidget *parent = 0);
 
     virtual ~KMiniPager();
 
     int widthForHeight(int height) const;
     int heightForWidth(int width) const;
 
-    KWindowSystem::WindowInfo* info( WId win );
+    KWindowInfo* info( WId win );
     KShadowEngine* shadowEngine();
 
     void setActive( WId active ) { m_activeWindow = active; }
@@ -116,7 +116,7 @@
     int m_curDesk;
     int m_rmbDesk;
 
-    QHash< int, KWindowSystem::WindowInfo* > m_windows;
+    QHash< int, KWindowInfo* > m_windows;
     WId m_activeWindow;
 
     QButtonGroup *m_group;
--- trunk/KDE/kdebase/workspace/kicker/applets/minipager/pagerbutton.h #679706:679707
@@ -84,7 +84,7 @@
     void backgroundLoaded( bool loaded );
 
 private:
-    bool shouldPaintWindow( KWindowSystem::WindowInfo *info );
+    bool shouldPaintWindow( KWindowInfo *info );
     void loadBgPixmap();
 
     KMiniPager* m_pager;


[prev in list] [next in list] [prev in thread] [next in thread]