浏览代码

Drop ksharedconfig.h check, should always be there in 3.90.1.

git-svn-id: file:///var/svn/tigccpp/trunk@1087 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler 17 年之前
父节点
当前提交
ba30574ee9
共有 3 个文件被更改,包括 0 次插入12 次删除
  1. 0 8
      ktigcc/completion.cpp
  2. 0 2
      ktigcc/ktigcc.pro
  3. 0 2
      ktigcc/newsdlg.cpp

+ 0 - 8
ktigcc/completion.cpp

@@ -455,11 +455,7 @@ bool parseSystemHeaders(QWidget *parent, const QString &directory,
 
 void loadSystemHeaderCompletion(void)
 {
-#ifdef HAVE_KSHAREDCONFIG_H
   KConfig config("data","ktigcc/completion",KConfig::NoGlobals);
-#else
-  KConfig config("ktigcc/completion",true,false,"data");
-#endif
   QStringList groupList=config.groupList();
   if (groupList.isEmpty()) {
     KMessageBox::queuedMessageBox(0,KMessageBox::Sorry,
@@ -501,11 +497,7 @@ void loadSystemHeaderCompletion(void)
 
 void saveSystemHeaderCompletion(void)
 {
-#ifdef HAVE_KSHAREDCONFIG_H
   KConfig config("data","ktigcc/completion",KConfig::NoGlobals);
-#else
-  KConfig config("ktigcc/completion",false,false,"data");
-#endif
   for (QMap<QString,CompletionInfo>::ConstIterator it=systemHeaderCompletion.begin();
        it!=systemHeaderCompletion.end(); ++it) {
     const QString &key=it.key();

+ 0 - 2
ktigcc/ktigcc.pro

@@ -183,8 +183,6 @@ isEmpty(CXXFLAGS) {
   }
 }
 *-g++*:CXXFLAGS += -DHAVE_STDINT_H
-# Test for a subtle API change between the official 3.80.3 release and the snapshot used by the kde-windows developers.
-exists($$KDEINCDIR/ksharedconfig.h):CXXFLAGS += -DHAVE_KSHAREDCONFIG_H
 QMAKE_CXXFLAGS_DEBUG = $$CXXFLAGS -Wno-non-virtual-dtor $$PKGCONFIG_CFLAGS
 QMAKE_CXXFLAGS_RELEASE = $$CXXFLAGS -Wno-non-virtual-dtor $$PKGCONFIG_CFLAGS
 

+ 0 - 2
ktigcc/newsdlg.cpp

@@ -26,9 +26,7 @@
 #include <kurl.h>
 #include <kio/netaccess.h>
 #include <kmessagebox.h>
-#ifdef HAVE_KSHAREDCONFIG_H
 #include <ksharedconfig.h>
-#endif
 #include <QVariant>
 #include <QImage>
 #include <QPixmap>