[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 603036 by mlaurent:

Fix compile with compilator != gcc


 M  +0 -5      config.h.cmake  
 M  +2 -0      kbabel/catalogmanager/catalogmanagerview.cpp  
 M  +2 -0      kbabel/commonui/klisteditor.cpp  
 M  +2 -0      kbabel/commonui/projectpref.cpp  
 M  +2 -0      kbabel/commonui/roughtransdlg.cpp  
 M  +2 -0      kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp  
 M  +2 -0      kbugbuster/gui/msginputdialog.cpp  
 M  +2 -0      kbugbuster/main.cpp  
 M  +2 -0      kcachegrind/kcachegrind/callgraphview.cpp  
 M  +4 -1      kcachegrind/kcachegrind/toplevel.cpp  
 M  +4 -0      kioslave/svn/svn.cpp  
 M  +2 -0      kompare/libdiff2/komparemodellist.cpp  
 M  +2 -0      kuiviewer/kuiviewer_part.cpp  
 M  +2 -0      umbrello/umbrello/dialogs/assocpropdlg.cpp  
 M  +4 -0      umbrello/umbrello/dialogs/classpropdlg.cpp  


--- trunk/KDE/kdesdk/config.h.cmake #603035:603036
@@ -6,8 +6,3 @@
 /* Version number of package */
 #define VERSION "3.9.02"
 
-
-
-
-
-
--- trunk/KDE/kdesdk/kbabel/catalogmanager/catalogmanagerview.cpp #603035:603036
@@ -158,7 +158,9 @@
    header()->setMovingEnabled(false);
    setAllColumnsShowFocus(true);
    setSorting(0);
+#ifdef __GNUC__
 #warning "kde4 port it"
+#endif   
 #if 0
    if(KContextMenuManager::showOnButtonPress())
    {
--- trunk/KDE/kdesdk/kbabel/commonui/klisteditor.cpp #603035:603036
@@ -137,7 +137,9 @@
 
 void KListEditor::setTitle( const QString &s )
 {
+#ifdef __GNUC__
 #warning FIXME Readd groupbox in designer
+#endif	
     //setTitle( s );
 }
 
--- trunk/KDE/kdesdk/kbabel/commonui/projectpref.cpp #603035:603036
@@ -138,7 +138,9 @@
     // current page only
 
     _project->settings()->useDefaults(true);
+#ifdef __GNUC__
 #warning "kde4: port it"
+#endif    
 #if 0
    switch(activePageIndex())
    {
--- trunk/KDE/kdesdk/kbabel/commonui/roughtransdlg.cpp #603035:603036
@@ -680,7 +680,9 @@
 {
     int nothing=totalTried-partTransCounter-exactTransCounter;
     KLocale *locale = KGlobal::locale();
+#ifdef __GNUC__
 #warning "kde4: verify this code !"
+#endif    
 #if 0
 	QString statMsg = ki18n("Result of the translation:\n"
             "Edited entries: %1\n"
--- trunk/KDE/kdesdk/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp #603035:603036
@@ -206,7 +206,9 @@
         SearchResult *result = new SearchResult;
         result->requested = text;
         result->found = data->catalog()->msgid(*index);
+#ifdef __GNUC__
 #warning	kWarning() << "PoCompendium can't return plural form translation" << endl;
+#endif	
         result->translation = data->catalog()->msgstr(*index).first();
         result->score = 100;
 
--- trunk/KDE/kdesdk/kbugbuster/gui/msginputdialog.cpp #603035:603036
@@ -208,7 +208,9 @@
 
 void MsgInputDialog::insertQuotedMessage( const QString &msg )
 {
+#ifdef __GNUC__
 #warning "kde4: comment before to port it";
+#endif	
 #if 0
 	Q_ASSERT( mMessageEdit->wordWrap() == Q3TextEdit::FixedColumnWidth );
 
--- trunk/KDE/kdesdk/kbugbuster/main.cpp #603035:603036
@@ -52,7 +52,9 @@
     KCmdLineArgs::addCmdLineOptions( options );
 
     KApplication app;
+#ifdef __GNUC__
 #warning "kde4: dbus port ?"
+#endif
     //app.dcopClient()->attach();
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/callgraphview.cpp #603035:603036
@@ -96,7 +96,9 @@
     if (!e1) return -1;
     if (!e2) return 1;
 
+#ifdef __GNUC__
 #warning please review the code - either *1 or *2 are unused and are still compared with
+#endif    
     int dx1, dy1, dx2, dy2;
     int x, y;
     if (_sortCallerPos) {
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/toplevel.cpp #603035:603036
@@ -407,7 +407,9 @@
 #endif
   }
   else {
+#ifdef __GNUC__
 #warning port to Qt4
+#endif
 #if 0
     QTextStream ts( &str, QIODevice::ReadOnly );
     ts >> *this;
@@ -1939,8 +1941,9 @@
   // We don't want to save the KToolbar position here.
   // Its already stored.
   delete toolBar();
-
+#ifdef __GNUC__
 #warning port to Qt4
+#endif  
 #if 0
   KConfigGroup dockConfig(KGlobal::config(), QByteArray("Docks"));
   QString str;
--- trunk/KDE/kdesdk/kioslave/svn/svn.cpp #603035:603036
@@ -839,7 +839,9 @@
 }
 
 void kio_svnProtocol::popupMessage( const QString& message ) {
+#ifdef __GNUC__
 #warning "kde4: port dbus stuff"
+#endif	
 #if 0
     QByteArray params;
 	QDataStream stream(&params, QIODevice::WriteOnly);
@@ -1254,7 +1256,9 @@
 }
 
 svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char **/*file*/, apr_array_header_t *commit_items, void *baton, apr_pool_t *pool ) {
+#ifdef __GNUC__
 #warning "kde4 port dbus stuff"
+#endif	
 #if 0
     DCOPCString replyType;
 	QByteArray params;
--- trunk/KDE/kdesdk/kompare/libdiff2/komparemodellist.cpp #603035:603036
@@ -365,7 +365,9 @@
 		{
 			if ( !KIO::NetAccess::mkdir( KUrl( destination ).path(), (QWidget*)parent() ) )
 			{
+#ifdef __GNUC__				
 				#warning i18n: Missing argument to the i18n call below
+#endif				
 				emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) );
 				return false;
 			}
--- trunk/KDE/kdesdk/kuiviewer/kuiviewer_part.cpp #603035:603036
@@ -77,7 +77,9 @@
     m_style->setEditable(false);
 
     KGlobal::config()->setGroup("General");
+#ifdef __GNUC__
 #warning "QT4 : KStyle::defaultStyle() doesn't exist";
+#endif
     const QString currentStyle = KGlobal::config()->readEntry("currentWidgetStyle"/*, KStyle::defaultStyle()*/);
 
     const QStringList styles = QStyleFactory::keys();
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/assocpropdlg.cpp #603035:603036
@@ -51,7 +51,9 @@
     m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed?
 
     setupPages(assocWidget);
+#ifdef __GNUC__
 #warning "kde4: port it"
+#endif    
     //showPage(pageNum);
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp #603035:603036
@@ -56,7 +56,9 @@
     m_pDoc = UMLApp::app()->getDocument();
     m_pObject = c;
     setupPages(c, assoc);
+#ifdef __GNUC__
 #warning "kde4: reimplement showPage"
+#endif    
     //showPage(pageNum);
 }
 
@@ -100,7 +102,9 @@
     m_pColorLayout -> addWidget(m_pColorPage);
 
     setupFontPage();
+#ifdef __GNUC__
 #warning "kde4: reimplement showPage"
+#endif    
     //showPage(0);
     setMinimumSize(340,420);
 }