r15951 by craig - Revert oops commit of index tests

[scribus-commit]

Author: craig
Date: Mon Nov 22 14:20:45 2010
New Revision: 15951

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15951
Log:
Revert oops commit of index tests

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/prefsstructs.h
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusdoc.h

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15951&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Mon Nov 22 14:20:45 2010
@@ -542,7 +542,6 @@
   hyphenator.cpp
 #  ui/hysettings.cpp
   ui/imageinfodialog.cpp
-  indexmanager.cpp
   ui/insertTable.cpp
   ui/insertaframe.cpp
   ui/inspage.cpp

Modified: trunk/Scribus/scribus/prefsstructs.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15951&path=/trunk/Scribus/scribus/prefsstructs.h
==============================================================================
--- trunk/Scribus/scribus/prefsstructs.h (original)
+++ trunk/Scribus/scribus/prefsstructs.h Mon Nov 22 14:20:45 2010
@@ -16,7 +16,6 @@
 #include <QList>
 #include <QSet>
 #include <QHash>
-#include <QVariant>
 #include "pagestructs.h"
 #include "pdfoptions.h"
 #include "scfonts.h"
@@ -388,14 +387,6 @@
 	int compressionLevel; //!< Cache image compression level (see QImage)
 };
 
-struct IndexPrefs
-{
-	//Index Map
-	//Map of Index Names, containing a Map of words/phrases with a list of page numbers
-	QMap<QString, QMap<QString, QList<int> > > indexMap;
-	QMap<QString, QVariant> indexVMap;
-};
-
 
 struct ApplicationPrefs
 {
@@ -441,7 +432,6 @@
 	//Added for Doc Only
 	DocumentInformation docInfo;
 	DocumentSectionMap docSectionMap;
-	IndexPrefs indexPrefs;
 };
 
 #endif

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15951&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Mon Nov 22 14:20:45 2010
@@ -356,8 +356,6 @@
 	m_itemsChanged.connectObserver(m_docUpdater);
 	m_pagesChanged.connectObserver(m_docUpdater);
 
-	m_indexManager = new IndexManager(docPrefsData.indexPrefs.indexMap,docPrefsData.indexPrefs.indexVMap);
-
 	PrefsManager *prefsManager = PrefsManager::instance();
 	docPrefsData.colorPrefs.DCMSset = prefsManager->appPrefs.colorPrefs.DCMSset;
 	docPrefsData.pdfPrefs.SolidProf = docPrefsData.colorPrefs.DCMSset.DefaultSolidColorRGBProfile;
@@ -471,8 +469,6 @@
 	m_masterPageMode=true; // quick hack to force the change of pointers in setMasterPageMode();
 	setMasterPageMode(false);
 	addSymbols();
-
-	docPrefsData.indexPrefs.indexMap.insert("Index", QMap<QString, QList<int> >());
 }
 
 

Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15951&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Mon Nov 22 14:20:45 2010
@@ -40,7 +40,6 @@
 #include "scribusapi.h"
 #include "colormgmt/sccolormgmtengine.h"
 #include "documentinformation.h"
-#include "indexmanager.h"
 #include "observable.h"
 #include "page.h"
 #include "pageitem.h"
@@ -224,9 +223,6 @@
 	void setSections(DocumentSectionMap dsm) { docPrefsData.docSectionMap=dsm; }
 	const QMap<QString, int> & usedFonts() { return UsedFonts; }
 
-	QMap<QString, QMap<QString, QList<int> > >& indexMap() { return docPrefsData.indexPrefs.indexMap; }
-	IndexManager* indexManager() { return m_indexManager; }
-
 	const ApplicationPrefs& prefsData() { return docPrefsData; }
 	void setNewPrefs(const ApplicationPrefs& prefsData, const ApplicationPrefs& oldPrefsData, bool resizePages, bool resizeMasterPages, bool resizePageMargins, bool resizeMasterPageMargins);
 
@@ -1042,7 +1038,6 @@
 	ScribusView* m_View;
 	ScGuardedObject<ScribusDoc> m_guardedObject;
 	Serializer *m_serializer;
-	IndexManager* m_indexManager;
 	
 public: // Public attributes
 	bool is12doc; //public for now, it will be removed later