Copying kpdf_experiments into branch and reordering directories. Look there

for the file naming map and file  versioning. Please wait until the commit
storm ends to report any bug. Albert and Enrico
File namings change.

svn path=/trunk/kdegraphics/kpdf/; revision=374924

core/document.cpp

@@ -28,9 +28,9 @@
 #include "document.h"
 #include "page.h"
 #include "link.h"
-#include "settings.h"
-#include "generator_pdf.h"  // PDF generator
-//#include "generator_ps.H" // PS generator
+#include "conf/settings.h"
+#include "generator_pdf/generator_pdf.h"  // PDF generator
+//#include "generator_ps/generator_ps.H" // PS generator
 
 // structures used internally by KPDFDocument for local variables storage
 class KPDFDocumentPrivate

core/generator_pdf/generator_pdf.cpp

@@ -31,9 +31,9 @@
 // local includes
 #include "generator_pdf.h"
 #include "gp_outputdev.h"
-#include "document.h" //for PAGEVIEW_ID
-#include "page.h"
-#include "settings.h"
+#include "core/document.h" //for PAGEVIEW_ID
+#include "core/page.h"
+#include "conf/settings.h"
 
 // id for DATA_READY ThreadedGenerator Event
 #define TGE_DATAREADY_ID 6969

core/generator_pdf/generator_pdf.h

@@ -15,9 +15,9 @@
 #include <qcolor.h>
 #include <qstring.h>
 #include <qthread.h>
-#include "generator.h"
-#include "document.h"
-#include "link.h"
+#include "core/generator.h"
+#include "core/document.h"
+#include "core/link.h"
 
 class PDFDoc;
 class GList;

core/generator_pdf/gp_outputdev.cpp

@@ -25,8 +25,8 @@
 
 #include "gp_outputdev.h"
 #include "generator_pdf.h"
-#include "page.h"
-#include "link.h"
+#include "core/page.h"
+#include "core/link.h"
 #include "xpdf/Link.h"
 #include "xpdf/GfxState.h"
 #include "xpdf/TextOutputDev.h"

core/link.cpp

@@ -13,14 +13,3 @@
 KPDFLink::~KPDFLink()
 {
 }
-
-/*
-void KPDFLink::copyString( char * &dest, const char * src ) const
-{
-    if ( src )
-    {
-        dest = new char[ strlen(src) + 1 ];
-        strcpy( &dest[0], src );
-    }
-}
-*/

core/link.h

@@ -15,7 +15,6 @@
 
 /**
  * @short Encapsulates data that describes a link.
- * ### MERGE: MOVE definition/implementation to kpdflink.h/.cpp
  * ### TODO: recomment
  */
 class KPDFLink
@@ -33,7 +32,7 @@ class KPDFLink
 class KPDFLinkGoto : public KPDFLink
 {
     public:
-        // define a 'Viewport' TODO improve this
+        // define a 'Viewport' TODO MERGE WITH PAGE DEFINED VIEWPORT
         struct Viewport {
             int page;
             bool fitWidth, fitHeight;

core/page.cpp

@@ -23,7 +23,7 @@
 // local includes
 #include "page.h"
 #include "link.h"
-#include "settings.h"
+#include "conf/settings.h"
 #include "xpdf/TextOutputDev.h"
 
 

ui/pageview.cpp

@@ -39,10 +39,10 @@
 
 #include "pageview.h"
 #include "pageviewutils.h"
-#include "page.h"
-#include "link.h"
-#include "generator.h"
-#include "settings.h"
+#include "core/page.h"
+#include "core/link.h"
+#include "core/generator.h"
+#include "conf/settings.h"
 
 #define ROUND(x) (int(x + 0.5))
 

ui/pageview.h

@@ -22,7 +22,7 @@
 #include <qscrollview.h>
 #include <qvaluevector.h>
 
-#include "document.h"
+#include "core/document.h"
 
 class KURL;
 class KActionCollection;

ui/pageviewutils.cpp

@@ -17,8 +17,8 @@
 
 // local includes
 #include "pageviewutils.h"
-#include "page.h"
-#include "settings.h"
+#include "core/page.h"
+#include "core/settings.h"
 
 PageViewMessage::PageViewMessage( QWidget * parent )
     : QWidget( parent, "pageViewMessage" ), m_timer( 0 )

ui/presentationwidget.cpp

@@ -25,10 +25,10 @@
 
 // local includes
 #include "presentationwidget.h"
-#include "document.h"   // for PRESENTATION_ID
-#include "generator.h"
-#include "page.h"
-#include "settings.h"
+#include "core/document.h"   // for PRESENTATION_ID
+#include "core/generator.h"
+#include "core/page.h"
+#include "conf/settings.h"
 
 
 // comment this to disable the top-right progress indicator

ui/presentationwidget.h

@@ -14,7 +14,7 @@
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qvaluevector.h>
-#include "document.h"
+#include "core/document.h"
 
 class PresentationFrame;
 class KToolBar;

ui/propertiesdialog.cpp

@@ -7,13 +7,14 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+// qt/kde includes
 #include <klocale.h>
-
 #include <qlabel.h>
 
-#include "document.h"
-#include "properties.h"
+// local includes
 #include "propertiesdialog.h"
+#include "properties.h"
+#include "core/document.h"
 
 propertiesDialog::propertiesDialog(QWidget *parent, KPDFDocument *doc) : KDialogBase(parent, 0, true, i18n( "Unknown file." ), Ok)
 {

ui/searchwidget.cpp

@@ -21,8 +21,8 @@
 
 // local includes
 #include "searchwidget.h"
-#include "document.h"
-#include "settings.h"
+#include "core/document.h"
+#include "conf/settings.h"
 
 // uncomment following to enable the case switching button
 //#define SW_ENABLE_CASE_BUTTON

ui/thumbnaillist.cpp

@@ -7,6 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+// qt/kde includes
 #include <qtimer.h>
 #include <qpainter.h>
 #include <klocale.h>
@@ -15,9 +16,10 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 
+// local includes
 #include "thumbnaillist.h"
-#include "generator.h"
-#include "page.h"
+#include "core/generator.h"
+#include "core/page.h"
 
 // ThumbnailWidget represents a single thumbnail in the ThumbnailList
 class ThumbnailWidget : public QWidget

ui/thumbnaillist.h

@@ -13,7 +13,7 @@
 #include <qscrollview.h>
 #include <qvaluevector.h>
 #include <qvbox.h>
-#include "document.h"
+#include "core/document.h"
 
 class QTimer;
 class KActionCollection;

ui/toc.cpp

@@ -13,8 +13,8 @@
 
 // local includes
 #include "toc.h"
-#include "page.h"
-#include "document.h"
+#include "core/page.h"
+#include "core/document.h"
 
 // uncomment following to enable a 2nd column showing the page referred by
 // each tree entry

ui/toc.h

@@ -12,7 +12,7 @@
 
 #include <klistview.h>
 
-#include "document.h"
+#include "core/document.h"
 
 class TOC : public KListView, public KPDFDocumentObserver
 {