From kde-commits  Sat Mar 19 19:26:35 2005
From: Ian Reinhart Geiser <geiseri () kde ! org>
Date: Sat, 19 Mar 2005 19:26:35 +0000
To: kde-commits
Subject: kdevelop
Message-Id: <20050319192635.DEAF11763F () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111126040614811

CVS commit by geiseri: 

Derobertofy the Catalog.  Removed a ton of unused crap, simplified the
code extenisivly.  Next step will be to remove bdb and replace it with
cdb.  One of the coolest things about robertos code is you can randomly
remove a line from it, and chances are you wont change its functionality ;)


  M +2 -2      languages/cpp/Makefile.am   1.90
  M +5 -4      lib/catalog/Makefile.am   1.9
  M +66 -303   lib/catalog/catalog.cpp   1.9
  M +39 -6     lib/catalog/catalog.h   1.7
  R            lib/catalog/gcatalog.h   1.2
  R            lib/catalog/gcatalog.tcc   1.7


--- kdevelop/languages/cpp/Makefile.am  #1.89:1.90
@@ -12,9 +12,9 @@
 
 kde_module_LTLIBRARIES = libkdevcppsupport.la
-libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -L$(top_srcdir)/bdb/dist
+libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \
         $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \
         $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \
-        $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/bdb/build_unix/libdb.a
+        $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la
 
 libkdevcppsupport_la_SOURCES = cppsupportpart.cpp ccconfigwidget.cpp \

--- kdevelop/lib/catalog/Makefile.am  #1.8:1.9
@@ -1,10 +1,11 @@
 INCLUDES = $(all_includes)
 lib_LTLIBRARIES = libkdevcatalog.la
-libkdevcatalog_la_SOURCES = tag.cpp
-libkdevcatalog_la_LDFLAGS = $(all_libraries) -no-undefined
-libkdevcatalog_la_LIBADD = $(LIB_QT)
+libkdevcatalog_la_SOURCES = tag.cpp catalog.cpp
+libkdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries)
+libkdevcatalog_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a \
+        $(LIB_KDECORE) $(LIB_QT)
 
 kdevcatalogincludedir = $(includedir)/kdevelop/catalog
-kdevcataloginclude_HEADERS = gcatalog.h gcatalog.tcc catalog.h tag.h
+kdevcataloginclude_HEADERS = catalog.h tag.h
 
 DOXYGEN_REFERENCES = dcop interfaces kdecore kdefx kdeui khtml kmdi kio kjs kparts kutils

--- kdevelop/lib/catalog/catalog.h  #1.6:1.7
@@ -21,14 +21,46 @@
 #define CATALOG_H
 
-#include "gcatalog.h"
+#include <qvaluelist.h>
+#include <qpair.h>
+#include <qvariant.h>
+
+
 #include "tag.h"
 
-/**
-Catalog to store symbol information.
-*/
-class Catalog: public GCatalog<Tag>
+class Catalog
 {
 public:
-    Catalog(): GCatalog<Tag>() {}
+    typedef QPair<QCString, QVariant> QueryArgument;
+
+public:
+    Catalog();
+    virtual ~Catalog();
+
+    bool isValid() const;
+    QString dbName() const;
+    
+    bool enabled() const;
+    void setEnabled( bool en );
+
+    virtual void open( const QString& dbName );
+    virtual void close();
+    virtual void sync();
+
+    QValueList<QCString> indexList() const;
+    void addIndex( const QCString& name );
+
+    void addItem( Tag& tag );
+
+    Tag getItemById( const QCString& id );
+    QValueList<Tag> query( const QValueList<QueryArgument>& args );
+
+    QCString generateId();
+
+private:
+   class _Catalog_Private* d;
+
+private:
+    Catalog( const Catalog& source );
+    void operator = ( const Catalog& source );
 };