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

List:       kde-commits
Subject:    KDE/kdelibs
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2006-02-04 17:41:44
Message-ID: 1139074904.528525.12339.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 505727 by chehrlic:

fix compile with msvc & update SConscript

 M  +3 -3      interfaces/kdocument/SConscript  
 M  +4 -8      interfaces/ktexteditor/SConscript  
 M  +2 -0      interfaces/ktexteditor/codecompletion2.h  
 M  +13 -23    kded/SConscript  
 M  +2 -4      kded/kbuildservicetypefactory.cpp  


--- trunk/KDE/kdelibs/interfaces/kdocument/SConscript #505726:505727
@@ -19,9 +19,9 @@
 obj.target = 'kdocument'
 obj.source = kdocument_sources
 obj.includes = includes
-obj.uselib = 'QT QTCORE QTGUI QT3SUPPORT KDE4 KPARTS '
-obj.libpaths = '../../kparts ../../kdeui'
-obj.libs = 'kparts kdeui'
+obj.uselib = 'QT QTCORE QTGUI QT3SUPPORT KDE4 KDEUI '
+obj.libpaths += '../../kparts '
+obj.libs     += ' kparts '
 obj.execute()
 
 env.bksys_insttype('KDEINCLUDE', 'kdocument', kdocumentinclude_headers)
--- trunk/KDE/kdelibs/interfaces/ktexteditor/SConscript #505726:505727
@@ -28,19 +28,15 @@
 attribute_p.h
 """
 
-includes = '../../kio ../../interfaces ../../kabc ../../interfaces/ktexteditor'
+includes = ' ../../interfaces ../../kabc ../../interfaces/ktexteditor'
 
 obj = env.kdeobj('shlib')
 obj.target = 'ktexteditor'
 obj.source = ktexteditor_sources
 obj.includes = includes
-obj.libpaths = '../../kdecore ../../kdeui ../../kparts ../../kio ../kdocument '
-obj.libs = 'kdecore kdeui kparts kio kdocument'
-obj.uselib = 'QT QTCORE QTGUI QT3SUPPORT KDE4 KPARTS '
-if env['WINDOWS']:
-	obj.libpaths += '../../win '
-	obj.libs += ' kdewin32'
-	
+obj.uselib = 'QT QTCORE QTGUI QT3SUPPORT KDE4 KDECORE KDEUI KIO '
+obj.libpaths += '../../kparts ../kdocument '
+obj.libs     += ' kparts kdocument '
 obj.execute()
 
 #obj = env.kdeobj('module')
--- trunk/KDE/kdelibs/interfaces/ktexteditor/codecompletion2.h #505726:505727
@@ -95,7 +95,9 @@
 
     /// Meta information is passed through extra {Qt::ItemDataRole}s.
     /// This information should be returned when requested on the Name column.
+#ifdef __GNUC__
 #warning ********     HighlightMethod didnt compile with gcc 3.3.6, so I changed it \
to HighlightingMethod, Alex +#endif
 /* the error message was:
 In file included from /home/alex/src/kde4-svn/kdelibs/kate/part/kateview.h:31,
                  from /home/alex/src/kde4-svn/kdelibs/kate/part/katesearch.cpp:27:
--- trunk/KDE/kdelibs/kded/SConscript #505726:505727
@@ -16,49 +16,39 @@
 kbuildservicegroupfactory.cpp kbuildprotocolinfofactory.cpp 
 kctimefactory.cpp vfolder_menu.cpp
 """
-obj.uselib   = 'QTCORE QTGUI QT3SUPPORT QT QTXML KDE4 KIO KDECORE KDEUI'
-obj.libpaths = ' ../kdefx ../dcop '
-obj.libs     = ' kdefx DCOP '
+obj.uselib   = 'QTCORE QTGUI QT3SUPPORT QT QTXML KDE4 KDECORE KIO KDEUI KDEFX'
+obj.libpaths = ' ../dcop '
+obj.libs     = ' DCOP '
 obj.instdir = env['KDEBIN']
-if env['WINDOWS']:
-	obj.libpaths += ' ../win'
-	obj.libs     += ' kdewin32'
 obj.execute()
 
 obj = env.kdeinitobj(env)
 obj.target   = 'kded'
 obj.source   = 'kded.cpp'
-obj.uselib   = 'QTCORE QTGUI QT3SUPPORT QT KDE4 KIO KDECORE KDEUI '
-obj.libpaths = ' ../kdefx ../dcop '
-obj.libs     = ' kdefx DCOP'
+obj.uselib   = 'QTCORE QTGUI QT3SUPPORT QT KDE4 KDECORE KIO KDEUI KDEFX'
+obj.libpaths = ' ../dcop '
+obj.libs     = ' DCOP'
 obj.instdir = env['KDEBIN']
 if env['WINDOWS']:
-	obj.libpaths += ' ../win '
-	obj.libs     += ' kdewin32 '
+	obj.ccflags  += ' -Dkdemain=main'
 obj.execute()
 
 obj=env.kdeobj('program', env)
 obj.target='kdontchangehostname'
 obj.source='khostname.cpp'
-obj.uselib   = 'QTCORE QTGUI QT QT3SUPPORT KDE4 KDECORE'
-obj.libpaths = ' ../kdefx ../kdeui ../dcop ../kio/kio'
-obj.libs     = ' kdefx DCOP'
+obj.uselib   = 'QTCORE QTGUI QT QT3SUPPORT KDE4 KDECORE KIO KDEUI KDEFX'
+obj.libpaths = ' ../dcop '
+obj.libs     = ' DCOP '
 obj.instdir = env['KDEBIN']
-if env['WINDOWS']:
-	obj.libpaths += ' ../win'
-	obj.libs     += ' kdewin32'
 obj.execute()
 
 obj=env.kdeobj('program', env)
 obj.target='kdemenu'
 obj.source='kde-menu.cpp'
-obj.uselib   = 'QTCORE QT QTGUI QT3SUPPORT KDE4 KIO'
-obj.libpaths = '../kdecore ../kdefx ../kdeui ../dcop ../kio/kio'
-obj.libs     = 'kdecore kdefx kdeui DCOP'
+obj.uselib   = 'QTCORE QT QTGUI QT3SUPPORT KDE4 KDECORE KIO KDEUI KDEFX'
+obj.libpaths = ' ../dcop '
+obj.libs     = ' DCOP '
 obj.instdir = env['KDEBIN']
-if env['WINDOWS']:
-	obj.libpaths += ' ../win'
-	obj.libs     += ' kdewin32'
 obj.execute()
 
 env.bksys_insttype( 'KDEDATA', 'kconf_update', 'kded.upd' )
--- trunk/KDE/kdelibs/kded/kbuildservicetypefactory.cpp #505726:505727
@@ -202,8 +202,7 @@
    str << entrySize;
 
    // For each fast pattern
-   QStringList::ConstIterator it = fastPatterns.begin();
-   for ( ; it != fastPatterns.end() ; ++it )
+   for ( QStringList::ConstIterator it = fastPatterns.begin(); it != \
fastPatterns.end() ; ++it )  {
      int start = str.device()->pos();
      // Justify to 6 chars with spaces, so that the size remains constant
@@ -227,8 +226,7 @@
    // For the other patterns
    str.device()->seek(m_otherPatternOffset);
 
-   it = otherPatterns.begin();
-   for ( ; it != otherPatterns.end() ; ++it )
+   for ( QStringList::ConstIterator it = otherPatterns.begin(); it != \
otherPatterns.end() ; ++it )  {
      //kDebug(7021) << QString("OTHER : '%1' \
'%2'").arg(*it).arg(dict[(*it)]->name()) << endl;  str << (*it);


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