head	1.2;
access;
symbols
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.02.01.02.20.44;	author markd;	state dead;
branches;
next	1.1;
commitid	gfmldqi8twZsclnx;

1.1
date	2013.11.11.16.47.07;	author joerg;	state Exp;
branches;
next	;
commitid	BORAuYcC54M8DScx;


desc
@@


1.2
log
@Update to KDE SC 4.11.5

bug fixes
@
text
@$NetBSD: patch-umbrello_codeimport_classimport.cpp,v 1.1 2013/11/11 16:47:07 joerg Exp $

Patches from upstream.

--- umbrello/codeimport/classimport.cpp.orig	2013-06-28 18:06:03.000000000 +0000
+++ umbrello/codeimport/classimport.cpp
@@@@ -20,9 +20,7 @@@@
 #include "javaimport.h"
 #include "adaimport.h"
 #include "pascalimport.h"
-#ifndef DISABLE_CPP_IMPORT
 #include "cppimport.h"
-#endif
 #include "csharpimport.h"
 #include "codeimpthread.h"
 
@@@@ -52,13 +50,8 @@@@ ClassImport *ClassImport::createImporter
         classImporter = new PascalImport(thread);
     else if (fileName.endsWith(QLatin1String(".cs")))
         classImporter = new CSharpImport(thread);
-#ifndef DISABLE_CPP_IMPORT
     else
         classImporter = new CppImport(thread);  // the default.
-#else
-    else 
-        classImporter = 0;
-#endif
     return classImporter;
 }
 
@


1.1
log
@Merge some changes from upstream to build with Sun PRO and libc++,
from rakuco@@FreeBSD.org.
@
text
@d1 1
a1 1
$NetBSD$
@