[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 605133 by mlaurent:

Fix compile under windows


 M  +2 -2      kbabel/catalogmanager/catalogmanager.cpp  
 M  +4 -1      kbabel/catalogmanager/main.cpp  
 M  +8 -0      kbabel/kbabel/kbabel.cpp  
 M  +4 -0      kbabel/kbabel/kbabelview.cpp  
 M  +18 -0     kbabel/kbabel/main.cpp  
 M  +2 -0      kbabel/kbabeldict/kbabeldictbox.cpp  
 M  +2 -0      umbrello/umbrello/main.cpp  


--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanager.cpp #605132:605133
@@ -169,10 +169,10 @@
            ,this,SLOT(openFile(QString,QString,int)));
    connect(_catalogManager, SIGNAL(selectedChanged(uint)),
            this, SLOT(selectedChanged(uint)));
-
+#ifdef Q_OS_UNIX
    KWin::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
-
+#endif
    QHBoxLayout* hBoxL = new QHBoxLayout();
    layout->addLayout( hBoxL );
    _progressLabel = new QLabel(view);
--- trunk/KDE/kdesdk/kbabel/catalogmanager/main.cpp #605132:605133
@@ -77,7 +77,9 @@
     if( _view )
     {
 	_view->raise();
+#ifdef Q_OS_UNIX	
 	KWin::activateWindow(_view->winId());
+#endif	
     }
 }
 
@@ -142,8 +144,9 @@
 	_view->setPreferredWindow( _preferredWindow );
 	_view->show();
 	_view->raise();
+#ifdef Q_OS_UNIX	
 	KWin::activateWindow(_view->winId());
-
+#endif
 	args->clear();
     }
 
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabel.cpp #605132:605133
@@ -1050,7 +1050,9 @@
    KBabelView *view = KBabelView::viewForURL(url,QString::null);
    if(view)
    {
+#ifdef Q_OS_UNIX	   
        KWin::activateWindow(view->topLevelWidget()->winId());
+#endif       
        return;
    }
 
@@ -1070,7 +1072,9 @@
    if(view)
    {
         kDebug(KBABEL) << "there is a such view" << endl;
+#ifdef Q_OS_UNIX	
        KWin::activateWindow(view->topLevelWidget()->winId());
+#endif
        return;
    }
 
@@ -1277,7 +1281,9 @@
     }
 
     _prefDialog->raise();
+#ifdef Q_OS_UNIX    
     KWin::activateWindow(_prefDialog->winId());
+#endif    
 }
 
 void KBabelMW::setLedColor(const QColor& color)
@@ -1873,7 +1879,9 @@
     }
 
     _projectDialog->raise();
+#ifdef Q_OS_UNIX    
     KWin::activateWindow(_projectDialog->winId());
+#endif    
 }
 
 void KBabelMW::addToRecentProjects(const KUrl& url)
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelview.cpp #605132:605133
@@ -1104,7 +1104,9 @@
    cu.cleanPath();
    if(checkIfModified && !url.isEmpty() && cu==url)
    {
+#ifdef Q_OS_UNIX	   
        KWin::activateWindow(topLevelWidget()->winId());
+#endif       
        return;
    }
 
@@ -1143,7 +1145,9 @@
 		return;
 	   }
 	   else {
+#ifdef Q_OS_UNIX		   
 	        KWin::activateWindow(v->topLevelWidget()->winId());
+#endif
         	return;
 	   }
        }
--- trunk/KDE/kdesdk/kbabel/kbabel/main.cpp #605132:605133
@@ -228,7 +228,9 @@
     KBabelMW *kb = KBabelMW::winForURL(u,project);
     if(kb)
     {
+#ifdef Q_OS_UNIX	    
         KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif	
     }
     else
     {
@@ -244,7 +246,9 @@
 	        if( mw && mw->inherits("KBabelMW") && mw->winId() == window )
     	        {
         	    kb = static_cast<KBabelMW*>(mw);
+#ifdef Q_OS_UNIX		    
         	    KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif		    
         	    kb->open(u, QString::fromUtf8(package),newWindow);
 
                     // TODO: There's no replacement for suspend or resume in QtDBus
@@ -262,7 +266,9 @@
 	{
 	    // here, we don't care about "open in new window", because
 	    // it's empty
+#ifdef Q_OS_UNIX 
     	    KWin::activateWindow( kb->topLevelWidget()->winId() );
+#endif	    
 	    kb->projectOpen(projectFile);
     	    kb->open(u,QString::fromUtf8(package),false);
 
@@ -286,7 +292,9 @@
 	        if( mw && mw->inherits("KBabelMW") && mw->winId() == window )
     	        {
         	    kb = static_cast<KBabelMW*>(mw);
+#ifdef Q_OS_UNIX		    
         	    KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif		    
         	    kb->open(u, QString::fromUtf8(package),newWindow);
 
                     // TODO: There's no replacement for suspend or resume in QtDBus
@@ -300,7 +308,9 @@
 
 	kb = new KBabelMW(project);
     	kb->show();
+#ifdef Q_OS_UNIX	
         KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif	
         kb->open(u,QString::fromUtf8(package),newWindow);
     }
 
@@ -328,7 +338,9 @@
     KBabelMW *kb = KBabelMW::winForURL(u, project);
     if(kb)
     {
+#ifdef Q_OS_UNIX	    
         KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif	
     }
     else
     {
@@ -342,7 +354,9 @@
             if( mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project() == project )
             {
                 kb = static_cast<KBabelMW*>(mw);
+#ifdef Q_OS_UNIX		
                 KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif		
 	        kb->projectOpen(projectFile);
                 kb->openTemplate(t,u,QString::fromUtf8(package),newWindow);
              }
@@ -352,7 +366,9 @@
             // We have no main window or we have not found the correct one
             kb = new KBabelMW(project);
             kb->show();
+#ifdef Q_OS_UNIX	    
             KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif	    
             kb->openTemplate(t,u,QString::fromUtf8(package));
         }
     }
@@ -484,7 +500,9 @@
 
 	if(kb)
 	{
+#ifdef Q_OS_UNIX		
     	    KWin::activateWindow(kb->topLevelWidget()->winId());
+#endif	    
 	}
     }
 
--- trunk/KDE/kdesdk/kbabel/kbabeldict/kbabeldictbox.cpp #605132:605133
@@ -1516,7 +1516,9 @@
    QWidget* w = prefDialogs[id];
    if(w)
    {
+#ifdef Q_OS_UNIX	   
        KWin::activateWindow( w->winId() );
+#endif
        return;
    }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #605132:605133
@@ -153,8 +153,10 @@
     if (showGUI && showLogo) {
         startLogo = new KStartupLogo(0);
         startLogo->setHideEnabled(true);
+#ifdef Q_OS_UNIX	
         KWin::setMainWindow(startLogo, UMLApp::app()->winId());
         KWin::setState(startLogo->winId(), NET::KeepAbove);
+#endif	
         startLogo->show();
         QApplication::flushX();
     }