93 files changed, 183 insertions, 203 deletions
diff --git a/kpdf/CMakeL10n.txt b/kpdf/CMakeL10n.txt
index d223ae9d..9373a9c0 100644
--- a/kpdf/CMakeL10n.txt
+++ b/kpdf/CMakeL10n.txt
@@ -1,3 +1,9 @@
 ##### create translation templates ##############
 
 tde_l10n_create_template( "kpdf" )
+
+tde_l10n_create_template(
+    CATALOG "desktop_files/kpdf-desktops/"
+    SOURCES *.desktop
+    DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/kpdf/CMakeLists.txt b/kpdf/CMakeLists.txt
index ccef1e04..b35af955 100644
--- a/kpdf/CMakeLists.txt
+++ b/kpdf/CMakeLists.txt
@@ -33,7 +33,13 @@ link_directories(
 ##### other data ################################
 
 tde_install_icons( kpdf )
-install( FILES kpdf_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+
+tde_create_translated_desktop(
+  SOURCE kpdf_part.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+  PO_DIR kpdf-desktops
+)
+
 install( FILES part.rc DESTINATION ${DATA_INSTALL_DIR}/kpdfpart )
 
 
@@ -45,7 +51,8 @@ tde_add_kpart( libkpdfpart AUTOMOC
   LINK
     kpdfconf-static kpdfui-static kpdfcore-static generatorkimgio-static
     generatorpdf-static xpdf-static goo-static splash-static fofi-static
-    tdeutils-shared tdeprint-shared tdeparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES}
+    tdeutils-shared tdeprint-shared tdeparts-shared
+    ${PAPER_LIBRARY} ${XFT_LIBRARIES} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
   DEPENDENCIES kpdfconf-static
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kpdf/Makefile.am b/kpdf/Makefile.am
index 187989f7..270bc883 100644
--- a/kpdf/Makefile.am
+++ b/kpdf/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp
-	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/kpdf.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/kpdf.pot
 
 KDE_ICON = kpdf
 
diff --git a/kpdf/TODO b/kpdf/TODO
index d917fd1d..53f0cc17 100644
--- a/kpdf/TODO
+++ b/kpdf/TODO
@@ -46,7 +46,7 @@ More items (first items will enter 'In progress list' first):
 -> take care of TODOs in code
 -> ADD: click over image allows "save image" [60% done (activerect of type image)]
 -> export all text in plain_text/html
--> extract(export?) images (have a look at ImageOutputDev.cc and pdfimages.cc from xpdf (not in our xpdf sources))
+-> extract(export?) images (have a look at ImageOutputDev.cpp and pdfimages.cpp from xpdf (not in our xpdf sources))
 -> text selection in wordprocessor style (very hard)
 -> zoom: fit text (with configurable margin)
 -> bookview: 3d opengl widget for viewing the document as a real book (turning pages, etc..)
diff --git a/kpdf/conf/kpdf.kcfg b/kpdf/conf/kpdf.kcfg
index 9f54b412..7f84081e 100644
--- a/kpdf/conf/kpdf.kcfg
+++ b/kpdf/conf/kpdf.kcfg
@@ -76,6 +76,9 @@
   <entry key="ViewContinuous" type="Bool" >
    <default>true</default>
   </entry>
+  <entry key="ViewCoverPage" type="Bool" >
+   <default>false</default>
+  </entry>
   <entry key="ViewColumns" type="UInt" >
    <default>1</default>
    <min>1</min>
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 4af2c1a4..dcb0252c 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -778,7 +778,7 @@ void PDFGenerator::scanFont(GfxFont *font, TDEListView *list, Ref **fonts, int &
 TQString PDFGenerator::getDocumentInfo( const TQString & data, bool canReturnNull ) const
 // note: MUTEX is LOCKED while calling this
 {
-    // [Albert] Code adapted from pdfinfo.cc on xpdf
+    // [Albert] Code adapted from pdfinfo.cpp on xpdf
     Object info;
     if ( !pdfdoc )
         return canReturnNull ? TQString() : i18n( "Unknown" );
@@ -805,7 +805,7 @@ TQString PDFGenerator::getDocumentInfo( const TQString & data, bool canReturnNul
 TQString PDFGenerator::getDocumentDate( const TQString & data ) const
 // note: MUTEX is LOCKED while calling this
 {
-    // [Albert] Code adapted from pdfinfo.cc on xpdf
+    // [Albert] Code adapted from pdfinfo.cpp on xpdf
     if ( !pdfdoc )
         return i18n( "Unknown Date" );
 
diff --git a/kpdf/kpdf_part.desktop b/kpdf/kpdf_part.desktop
index a3620ada..138b8a68 100644
--- a/kpdf/kpdf_part.desktop
+++ b/kpdf/kpdf_part.desktop
@@ -1,9 +1,6 @@
 [Desktop Entry]
 Icon=kpdf
 Name=KPDF
-Name[ar]=برنامج KPDF
-Name[hi]=के-पीडीएफ
-Name[zh_TW]=KPDF 檢視器
 MimeType=application/pdf
 X-TDE-InitialPreference=7
 X-TDE-ServiceTypes=KParts/ReadOnlyPart
diff --git a/kpdf/part.h b/kpdf/part.h
index 50be072f..afa39250 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -210,5 +210,3 @@ public slots:
 }
 
 #endif
-
-// vim:ts=2:sw=2:tw=78:et
diff --git a/kpdf/part.rc b/kpdf/part.rc
index 194e94ac..d69959d4 100644
--- a/kpdf/part.rc
+++ b/kpdf/part.rc
@@ -24,6 +24,7 @@
     <Separator/>
     <Action name="view_continuous"/>
     <Action name="view_twopages"/>
+    <Action name="view_coverpage"/>
   </Menu>
   <Menu name="go"><text>&amp;Go</text>
     <Action name="previous_page"/>
diff --git a/kpdf/shell/CMakeLists.txt b/kpdf/shell/CMakeLists.txt
index 74553840..30691f02 100644
--- a/kpdf/shell/CMakeLists.txt
+++ b/kpdf/shell/CMakeLists.txt
@@ -23,7 +23,11 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kpdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+tde_create_translated_desktop(
+  SOURCE kpdf.desktop
+  PO_DIR kpdf-desktops
+)
+
 install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/kpdf )
 
 
diff --git a/kpdf/shell/kpdf.desktop b/kpdf/shell/kpdf.desktop
index dc4a96a9..630fcf2e 100644
--- a/kpdf/shell/kpdf.desktop
+++ b/kpdf/shell/kpdf.desktop
@@ -2,81 +2,10 @@
 MimeType=application/pdf;
 Terminal=false
 Name=KPDF
-Name[ar]=برنامج KPDF
-Name[hi]=के-पीडीएफ
-Name[zh_TW]=KPDF 檢視器
 GenericName=PDF Viewer
-GenericName[ar]=عارض ملفات PDF
-GenericName[az]=PDF Nümayişçisi
-GenericName[bg]=Преглед на документи PDF
-GenericName[br]=Gweler PDF
-GenericName[bs]=Preglednik PDF dokumenata
-GenericName[ca]=Visualitzador de PDF
-GenericName[cs]=Prohlížeč PDF souborů
-GenericName[cy]=Gwelydd PDF
-GenericName[da]=PDF-fremviser
-GenericName[de]=PDF-Betrachter
-GenericName[el]=Προβολέας PDF
-GenericName[eo]=PDF-rigardilo
-GenericName[es]=Visor de PDF
-GenericName[et]=PDF-failide näitaja
-GenericName[eu]=PDF ikustailua
-GenericName[fa]=مشاهده‌گر PDF
-GenericName[fi]=PDF-näytin
-GenericName[fr]=Afficheur PDF
-GenericName[ga]=Amharcán PDF
-GenericName[gl]=Visor PDF
-GenericName[he]=מציג PDF
-GenericName[hi]=पीडीएफ प्रदर्शक
-GenericName[hr]=Preglednik PDF dokumenata
-GenericName[hu]=PDF-nézegető
-GenericName[id]=Viewer PDF
-GenericName[is]=PDF sjá
-GenericName[it]=Visore PDF
-GenericName[ja]=PDF ビューア
-GenericName[kk]=PDF файлдарын қарау
-GenericName[km]=កម្មវិធីមើល PDF
-GenericName[lt]=PDF Žiūriklis
-GenericName[lv]=PDF Skatītājs
-GenericName[mk]=Прикажувач на PDF датотеки
-GenericName[ms]=Pemapar PDF
-GenericName[mt]=Werrej PDF
-GenericName[nb]=PDF-fremviser
-GenericName[nds]=PDF-Kieker
-GenericName[ne]=PDF दर्शक
-GenericName[nl]=PDF-weergaveprogramma
-GenericName[nn]=PDF-lesar
-GenericName[pa]=PDF ਦਰਸ਼ਕ
-GenericName[pl]=Przeglądarka plików PDF
-GenericName[pt]=Visualizador de PDFs
-GenericName[pt_BR]=Visualizador de arquivos PDF
-GenericName[ro]=Vizualizor PDF
-GenericName[ru]=Просмотр PDF
-GenericName[rw]=Mugaragaza PDF
-GenericName[se]=PDF-čájeheaddji
-GenericName[sk]=Prehliadač PDF
-GenericName[sl]=Pregledovalnik datotek PDF
-GenericName[sr]=PDF приказивач
-GenericName[sr@Latn]=PDF prikazivač
-GenericName[sv]=PDF-visare
-GenericName[ta]=PS/PDF காட்சி
-GenericName[tg]=Хондани санадоти PDF
-GenericName[th]=ตัวแสดงผล PDF
-GenericName[tr]=PDF Görüntüleyici
-GenericName[uk]=Переглядач PDF
-GenericName[uz]=PDF koʻruvchi
-GenericName[uz@cyrillic]=PDF кўрувчи
-GenericName[ven]=Tshivhoni tsha PDF
-GenericName[wa]=Håyneu di documints PDF
-GenericName[xh]=Umboniseli we PDF
-GenericName[zh_CN]=PDF 查看器
-GenericName[zh_HK]=PDF 檢視器
-GenericName[zh_TW]=PDF 檢視器
-GenericName[zu]=Umboniseli we PDF
 Exec=kpdf %U %i -caption "%c"
 Icon=kpdf
 Type=Application
 X-DocPath=kpdf/index.html
 X-TDE-InitialPreference=7
 Categories=Qt;TDE;Office;Viewer;
-
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp
index 1ed61999..9b8d0a18 100644
--- a/kpdf/shell/main.cpp
+++ b/kpdf/shell/main.cpp
@@ -78,5 +78,3 @@ int main(int argc, char** argv)
 
     return app.exec();
 }
-
-// vim:ts=2:sw=2:tw=78:et
diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h
index 560be8fd..6c2e4057 100644
--- a/kpdf/shell/shell.h
+++ b/kpdf/shell/shell.h
@@ -109,5 +109,3 @@ namespace KPDF
 }
 
 #endif
-
-// vim:ts=2:sw=2:tw=78:et
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 58c46101..97302be4 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -2,7 +2,7 @@
  *   Copyright (C) 2004 by Enrico Ros <eros.kde@email.it>                  *
  *   Copyright (C) 2004-2006 by Albert Astals Cid <tsdgeos@terra.es>       *
  *                                                                         *
- *   With portions of code from kpdf/kpdf_pagewidget.cc by:                *
+ *   With portions of code from kpdf/kpdf_pagewidget.cpp by:                *
  *     Copyright (C) 2002 by Wilco Greven <greven@kde.org>                 *
  *     Copyright (C) 2003 by Christophe Devriese                           *
  *                           <Christophe.Devriese@student.kuleuven.ac.be>  *
@@ -114,6 +114,7 @@ public:
     TDEToggleAction * aZoomFitText;
     TDEToggleAction * aViewTwoPages;
     TDEToggleAction * aViewContinuous;
+    TDEToggleAction * aViewCoverPage;
     TDEAction * aPrevAction;
 };
 
@@ -282,6 +283,11 @@ void PageView::setupActions( TDEActionCollection * ac )
     connect( d->aViewContinuous, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotContinuousToggled( bool ) ) );
     d->aViewContinuous->setChecked( KpdfSettings::viewContinuous() );
 
+    d->aViewCoverPage = new TDEToggleAction( i18n("Co&ver Page"), "contents2", 0, ac, "view_coverpage" );
+    connect( d->aViewCoverPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotCoverPageToggled( bool ) ) );
+    d->aViewCoverPage->setChecked( KpdfSettings::viewCoverPage() );
+    d->aViewCoverPage->setEnabled( KpdfSettings::viewColumns() > 1 );
+
     // Mouse-Mode actions
     d->aMouseNormal = new TDERadioAction( i18n("&Browse Tool"), "input-mouse", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" );
     d->aMouseNormal->setExclusiveGroup( "MouseType" );
@@ -1056,8 +1062,8 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 double nX = (double)(selRect.left() + selRect.right()) / (2.0 * (double)contentsWidth());
                 double nY = (double)(selRect.top() + selRect.bottom()) / (2.0 * (double)contentsHeight());
 
-                // zoom up to 400%
-                if ( d->zoomFactor <= 4.0 || zoom <= 1.0 )
+                // zoom up to 800%
+                if ( d->zoomFactor <= 8.0 || zoom <= 1.0 )
                 {
                     d->zoomFactor *= zoom;
                     viewport()->setUpdatesEnabled( false );
@@ -1537,8 +1543,8 @@ void PageView::updateZoom( ZoomMode newZoomMode )
             d->zoomFactor = -1;
             break;
     }
-    if ( newFactor > 4.0 )
-        newFactor = 4.0;
+    if ( newFactor > 8.0 )
+        newFactor = 8.0;
     if ( newFactor < 0.1 )
         newFactor = 0.1;
 
@@ -1582,13 +1588,13 @@ void PageView::updateZoomText()
 
     // add percent items
     TQString double_oh( "00" );
-    const float zoomValue[10] = { 0.125, 0.25, 0.333, 0.5, 0.667, 0.75, 1, 1.25, 1.50, 2 };
+    const float zoomValue[11] = { 0.125, 0.25, 0.333, 0.5, 0.667, 0.75, 1, 1.25, 1.50, 2, 4 };
     int idx = 0,
         selIdx = 2; // use 3 if "fit text" present
     bool inserted = false; //use: "d->zoomMode != ZoomFixed" to hide Fit/* zoom ratio
-    while ( idx < 10 || !inserted )
+    while ( idx < 11 || !inserted )
     {
-        float value = idx < 10 ? zoomValue[ idx ] : newFactor;
+        float value = idx < 11 ? zoomValue[ idx ] : newFactor;
         if ( !inserted && newFactor < (value - 0.0001) )
             value = newFactor;
         else
@@ -1652,6 +1658,7 @@ void PageView::doTypeAheadSearch()
 void PageView::slotRelayoutPages()
 // called by: notifySetup, viewportResizeEvent, slotTwoPagesToggled, slotContinuousToggled, updateZoom
 {
+    bool coverPageMode = ( KpdfSettings::viewColumns() == 2 && KpdfSettings::viewCoverPage() );
     // set an empty container if we have no pages
     int pageCount = d->items.count();
     if ( pageCount < 1 )
@@ -1682,11 +1689,12 @@ void PageView::slotRelayoutPages()
     {
         // Here we find out column's width and row's height to compute a table
         // so we can place widgets 'centered in virtual cells'.
-        int nCols = KpdfSettings::viewColumns(),
-            nRows = (int)ceil( (float)pageCount / (float)nCols ),
+        int pageShift = coverPageMode ? 1 : 0,
+            nCols = KpdfSettings::viewColumns(),
+            nRows = (int)ceil( (float)(pageCount + pageShift) / (float)nCols ),
             * colWidth = new int[ nCols ],
             * rowHeight = new int[ nRows ],
-            cIdx = 0,
+            cIdx = pageShift,
             rIdx = 0;
         for ( int i = 0; i < nCols; i++ )
             colWidth[ i ] = viewportWidth / nCols;
@@ -1716,13 +1724,18 @@ void PageView::slotRelayoutPages()
         // 2) arrange widgets inside cells
         int insertX = 0,
             insertY = 4; // 2 + 4*d->zoomFactor ?
-        cIdx = 0;
+        cIdx = pageShift;
         rIdx = 0;
+
         for ( iIt = d->items.begin(); iIt != iEnd; ++iIt )
         {
             PageViewItem * item = *iIt;
             int cWidth = colWidth[ cIdx ],
                 rHeight = rowHeight[ rIdx ];
+
+            if( coverPageMode && item->pageNumber() == 0 ) // align widget right inside viewport
+                insertX+=cWidth;
+
             // center widget inside 'cells'
             item->moveTo( insertX + (cWidth - item->width()) / 2,
                           insertY + (rHeight - item->height()) / 2 );
@@ -1776,14 +1789,24 @@ void PageView::slotRelayoutPages()
         // 2) hide all widgets except the displayable ones and dispose those
         int insertX = 0;
         cIdx = 0;
+
+        if( coverPageMode && (int)d->document->currentPage() == 0 )
+            ++cIdx;
+
         for ( iIt = d->items.begin(); iIt != iEnd; ++iIt )
         {
             PageViewItem * item = *iIt;
             if ( item == currentItem || (cIdx > 0 && cIdx < nCols) )
             {
-                // center widget inside 'cells'
-                item->moveTo( insertX + (colWidth[ cIdx ] - item->width()) / 2,
-                              (fullHeight - item->height()) / 2 );
+                if( KpdfSettings::viewCoverPage() && (int)d->document->currentPage() == 0 ) {
+                    // center widget inside viewport
+                    item->moveTo( insertX + (viewportWidth - item->width()) / 2,
+                                  (viewportHeight - item->height()) / 2 );
+                } else {
+                    // center widget inside 'cells'
+                    item->moveTo( insertX + (colWidth[ cIdx ] - item->width()) / 2,
+                                  (fullHeight - item->height()) / 2 );
+                }
                 // advance col index
                 insertX += colWidth[ cIdx ];
                 cIdx++;
@@ -2110,6 +2133,8 @@ void PageView::slotTwoPagesToggled( bool on )
         if ( d->document->pages() > 0 )
             slotRelayoutPages();
     }
+
+    d->aViewCoverPage->setEnabled( on );
 }
 
 void PageView::slotContinuousToggled( bool on )
@@ -2123,6 +2148,17 @@ void PageView::slotContinuousToggled( bool on )
     }
 }
 
+void PageView::slotCoverPageToggled( bool on )
+{
+    if ( KpdfSettings::viewCoverPage() != on )
+    {
+        KpdfSettings::setViewCoverPage( on );
+        KpdfSettings::writeConfig();
+        if ( d->document->pages() > 0 )
+            slotRelayoutPages();
+    }
+}
+
 void PageView::slotSetMouseNormal()
 {
     d->mouseMode = MouseNormal;
diff --git a/kpdf/ui/pageview.h b/kpdf/ui/pageview.h
index 901ec9e6..267c58f5 100644
--- a/kpdf/ui/pageview.h
+++ b/kpdf/ui/pageview.h
@@ -140,6 +140,7 @@ class PageView : public TQScrollView, public DocumentObserver
         void slotRotateLeft();
         void slotTwoPagesToggled( bool );
         void slotContinuousToggled( bool );
+	void slotCoverPageToggled( bool );
         void slotSetMouseNormal();
         void slotSetMouseZoom();
         void slotSetMouseSelect();
diff --git a/kpdf/xpdf/fofi/CMakeLists.txt b/kpdf/xpdf/fofi/CMakeLists.txt
index e98957f3..2f983315 100644
--- a/kpdf/xpdf/fofi/CMakeLists.txt
+++ b/kpdf/xpdf/fofi/CMakeLists.txt
@@ -21,6 +21,6 @@ include_directories(
 
 tde_add_library( fofi STATIC_PIC
   SOURCES
-    FoFiBase.cc FoFiEncodings.cc FoFiTrueType.cc FoFiType1.cc
-    FoFiType1C.cc
+    FoFiBase.cpp FoFiEncodings.cpp FoFiTrueType.cpp FoFiType1.cpp
+    FoFiType1C.cpp
 )
diff --git a/kpdf/xpdf/fofi/FoFiBase.cc b/kpdf/xpdf/fofi/FoFiBase.cpp
index 28d0b8ca..af6fe112 100644
--- a/kpdf/xpdf/fofi/FoFiBase.cc
+++ b/kpdf/xpdf/fofi/FoFiBase.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FoFiBase.cc
+// FoFiBase.cpp
 //
 // Copyright 1999-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/fofi/FoFiEncodings.cc b/kpdf/xpdf/fofi/FoFiEncodings.cpp
index 37a17f5d..3c0d39a3 100644
--- a/kpdf/xpdf/fofi/FoFiEncodings.cc
+++ b/kpdf/xpdf/fofi/FoFiEncodings.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FoFiEncodings.cc
+// FoFiEncodings.cpp
 //
 // Copyright 1999-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/fofi/FoFiTrueType.cc b/kpdf/xpdf/fofi/FoFiTrueType.cpp
index a205a068..18253335 100644
--- a/kpdf/xpdf/fofi/FoFiTrueType.cc
+++ b/kpdf/xpdf/fofi/FoFiTrueType.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FoFiTrueType.cc
+// FoFiTrueType.cpp
 //
 // Copyright 1999-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/fofi/FoFiType1.cc b/kpdf/xpdf/fofi/FoFiType1.cpp
index 88b35ecc..f6e676a2 100644
--- a/kpdf/xpdf/fofi/FoFiType1.cc
+++ b/kpdf/xpdf/fofi/FoFiType1.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FoFiType1.cc
+// FoFiType1.cpp
 //
 // Copyright 1999-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/fofi/FoFiType1C.cc b/kpdf/xpdf/fofi/FoFiType1C.cpp
index 3b28f321..f2ca88dc 100644
--- a/kpdf/xpdf/fofi/FoFiType1C.cc
+++ b/kpdf/xpdf/fofi/FoFiType1C.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FoFiType1C.cc
+// FoFiType1C.cpp
 //
 // Copyright 1999-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/fofi/Makefile.am b/kpdf/xpdf/fofi/Makefile.am
index 7ca93922..9a1ec4aa 100644
--- a/kpdf/xpdf/fofi/Makefile.am
+++ b/kpdf/xpdf/fofi/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../goo $(all_includes)
 
 libfofi_la_LDFLAGS = $(all_libraries)
-libfofi_la_SOURCES = FoFiBase.cc FoFiEncodings.cc FoFiTrueType.cc \
-    FoFiType1.cc FoFiType1C.cc
+libfofi_la_SOURCES = FoFiBase.cpp FoFiEncodings.cpp FoFiTrueType.cpp \
+    FoFiType1.cpp FoFiType1C.cpp
 
 METASOURCES = AUTO
 
diff --git a/kpdf/xpdf/goo/CMakeLists.txt b/kpdf/xpdf/goo/CMakeLists.txt
index 5a5a0ac8..dd6dc2d1 100644
--- a/kpdf/xpdf/goo/CMakeLists.txt
+++ b/kpdf/xpdf/goo/CMakeLists.txt
@@ -22,5 +22,5 @@ include_directories(
 
 tde_add_library( goo STATIC_PIC
   SOURCES
-    GHash.cc GList.cc GString.cc gfile.cc gmem.cc gmempp.cc
+    GHash.cpp GList.cpp GString.cpp gfile.cpp gmem.cpp gmempp.cpp
 )
diff --git a/kpdf/xpdf/goo/GHash.cc b/kpdf/xpdf/goo/GHash.cpp
index b51a7643..f642a261 100644
--- a/kpdf/xpdf/goo/GHash.cc
+++ b/kpdf/xpdf/goo/GHash.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GHash.cc
+// GHash.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/goo/GList.cc b/kpdf/xpdf/goo/GList.cpp
index fb5fd628..2a4e4695 100644
--- a/kpdf/xpdf/goo/GList.cc
+++ b/kpdf/xpdf/goo/GList.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GList.cc
+// GList.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/goo/GString.cc b/kpdf/xpdf/goo/GString.cpp
index e21fd3ea..89f122e1 100644
--- a/kpdf/xpdf/goo/GString.cc
+++ b/kpdf/xpdf/goo/GString.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GString.cc
+// GString.cpp
 //
 // Simple variable-length string type.
 //
diff --git a/kpdf/xpdf/goo/Makefile.am b/kpdf/xpdf/goo/Makefile.am
index 04933cee..00ffad0d 100644
--- a/kpdf/xpdf/goo/Makefile.am
+++ b/kpdf/xpdf/goo/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = -I$(srcdir)/..
 
-libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gfile.cc gmem.cc gmempp.cc
+libgoo_la_SOURCES = GHash.cpp GList.cpp GString.cpp gfile.cpp gmem.cpp gmempp.cpp
 
 noinst_LTLIBRARIES = libgoo.la
diff --git a/kpdf/xpdf/goo/gfile.cc b/kpdf/xpdf/goo/gfile.cpp
index 54a7be3d..bb75b855 100644
--- a/kpdf/xpdf/goo/gfile.cc
+++ b/kpdf/xpdf/goo/gfile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// gfile.cc
+// gfile.cpp
 //
 // Miscellaneous file and directory name manipulation.
 //
diff --git a/kpdf/xpdf/goo/gmem.cc b/kpdf/xpdf/goo/gmem.cpp
index d8962aba..d8962aba 100644
--- a/kpdf/xpdf/goo/gmem.cc
+++ b/kpdf/xpdf/goo/gmem.cpp
diff --git a/kpdf/xpdf/goo/gmempp.cc b/kpdf/xpdf/goo/gmempp.cpp
index b1ee970d..4804889b 100644
--- a/kpdf/xpdf/goo/gmempp.cc
+++ b/kpdf/xpdf/goo/gmempp.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// gmempp.cc
+// gmempp.cpp
 //
 // Use gmalloc/gfree for C++ new/delete operators.
 //
diff --git a/kpdf/xpdf/splash/CMakeLists.txt b/kpdf/xpdf/splash/CMakeLists.txt
index a7573b6c..a9c3d72b 100644
--- a/kpdf/xpdf/splash/CMakeLists.txt
+++ b/kpdf/xpdf/splash/CMakeLists.txt
@@ -23,10 +23,11 @@ include_directories(
 
 tde_add_library( splash STATIC_PIC
   SOURCES
-    Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc
-    SplashFTFontEngine.cc SplashFTFontFile.cc SplashFont.cc
-    SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc
-    SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc
-    SplashT1Font.cc SplashT1FontEngine.cc SplashT1FontFile.cc
-    SplashXPath.cc SplashXPathScanner.cc
+    Splash.cpp SplashBitmap.cpp SplashClip.cpp SplashFTFont.cpp
+    SplashFTFontEngine.cpp SplashFTFontFile.cpp SplashFont.cpp
+    SplashFontEngine.cpp SplashFontFile.cpp SplashFontFileID.cpp
+    SplashPath.cpp SplashPattern.cpp SplashScreen.cpp SplashState.cpp
+    SplashT1Font.cpp SplashT1FontEngine.cpp SplashT1FontFile.cpp
+    SplashXPath.cpp SplashXPathScanner.cpp
+  LINK ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
 )
diff --git a/kpdf/xpdf/splash/Makefile.am b/kpdf/xpdf/splash/Makefile.am
index 34d41419..724eaa6a 100644
--- a/kpdf/xpdf/splash/Makefile.am
+++ b/kpdf/xpdf/splash/Makefile.am
@@ -1,8 +1,8 @@
 INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(USER_INCLUDES)
 
-libsplash_la_SOURCES = Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc SplashFTFontEngine.cc \
-	SplashFTFontFile.cc SplashFont.cc SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc \
-	SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc SplashT1Font.cc \
-	SplashT1FontEngine.cc SplashT1FontFile.cc SplashXPath.cc SplashXPathScanner.cc
+libsplash_la_SOURCES = Splash.cpp SplashBitmap.cpp SplashClip.cpp SplashFTFont.cpp SplashFTFontEngine.cpp \
+	SplashFTFontFile.cpp SplashFont.cpp SplashFontEngine.cpp SplashFontFile.cpp SplashFontFileID.cpp \
+	SplashPath.cpp SplashPattern.cpp SplashScreen.cpp SplashState.cpp SplashT1Font.cpp \
+	SplashT1FontEngine.cpp SplashT1FontFile.cpp SplashXPath.cpp SplashXPathScanner.cpp
 
 noinst_LTLIBRARIES = libsplash.la
diff --git a/kpdf/xpdf/splash/Splash.cc b/kpdf/xpdf/splash/Splash.cpp
index 2b91e4e7..2cfc1ee2 100644
--- a/kpdf/xpdf/splash/Splash.cc
+++ b/kpdf/xpdf/splash/Splash.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Splash.cc
+// Splash.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashBitmap.cc b/kpdf/xpdf/splash/SplashBitmap.cpp
index 62bbd8e8..5b5d28d1 100644
--- a/kpdf/xpdf/splash/SplashBitmap.cc
+++ b/kpdf/xpdf/splash/SplashBitmap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashBitmap.cc
+// SplashBitmap.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashClip.cc b/kpdf/xpdf/splash/SplashClip.cpp
index ef8acbab..ba03b7a4 100644
--- a/kpdf/xpdf/splash/SplashClip.cc
+++ b/kpdf/xpdf/splash/SplashClip.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashClip.cc
+// SplashClip.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFTFont.cc b/kpdf/xpdf/splash/SplashFTFont.cpp
index 42d92af4..4bc31210 100644
--- a/kpdf/xpdf/splash/SplashFTFont.cc
+++ b/kpdf/xpdf/splash/SplashFTFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFTFont.cc
+// SplashFTFont.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFTFontEngine.cc b/kpdf/xpdf/splash/SplashFTFontEngine.cpp
index 02996de7..36cf32e6 100644
--- a/kpdf/xpdf/splash/SplashFTFontEngine.cc
+++ b/kpdf/xpdf/splash/SplashFTFontEngine.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFTFontEngine.cc
+// SplashFTFontEngine.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFTFontFile.cc b/kpdf/xpdf/splash/SplashFTFontFile.cpp
index 12725497..697c3ed8 100644
--- a/kpdf/xpdf/splash/SplashFTFontFile.cc
+++ b/kpdf/xpdf/splash/SplashFTFontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFTFontFile.cc
+// SplashFTFontFile.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFont.cc b/kpdf/xpdf/splash/SplashFont.cpp
index 4a91d5e8..42c9e999 100644
--- a/kpdf/xpdf/splash/SplashFont.cc
+++ b/kpdf/xpdf/splash/SplashFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFont.cc
+// SplashFont.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFontEngine.cc b/kpdf/xpdf/splash/SplashFontEngine.cpp
index 4dc1b35b..d79a48a0 100644
--- a/kpdf/xpdf/splash/SplashFontEngine.cc
+++ b/kpdf/xpdf/splash/SplashFontEngine.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontEngine.cc
+// SplashFontEngine.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFontFile.cc b/kpdf/xpdf/splash/SplashFontFile.cpp
index ad58c22d..c66447bb 100644
--- a/kpdf/xpdf/splash/SplashFontFile.cc
+++ b/kpdf/xpdf/splash/SplashFontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontFile.cc
+// SplashFontFile.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashFontFileID.cc b/kpdf/xpdf/splash/SplashFontFileID.cpp
index af37cb2f..9182d4d8 100644
--- a/kpdf/xpdf/splash/SplashFontFileID.cc
+++ b/kpdf/xpdf/splash/SplashFontFileID.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontFileID.cc
+// SplashFontFileID.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashPath.cc b/kpdf/xpdf/splash/SplashPath.cpp
index e3a89271..4a3c334c 100644
--- a/kpdf/xpdf/splash/SplashPath.cc
+++ b/kpdf/xpdf/splash/SplashPath.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashPath.cc
+// SplashPath.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashPattern.cc b/kpdf/xpdf/splash/SplashPattern.cpp
index e6a37852..2aa4f70f 100644
--- a/kpdf/xpdf/splash/SplashPattern.cc
+++ b/kpdf/xpdf/splash/SplashPattern.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashPattern.cc
+// SplashPattern.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashScreen.cc b/kpdf/xpdf/splash/SplashScreen.cpp
index 3e8d36ca..a1f50c0a 100644
--- a/kpdf/xpdf/splash/SplashScreen.cc
+++ b/kpdf/xpdf/splash/SplashScreen.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashScreen.cc
+// SplashScreen.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashState.cc b/kpdf/xpdf/splash/SplashState.cpp
index e2c34c44..17445ad7 100644
--- a/kpdf/xpdf/splash/SplashState.cc
+++ b/kpdf/xpdf/splash/SplashState.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashState.cc
+// SplashState.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashT1Font.cc b/kpdf/xpdf/splash/SplashT1Font.cpp
index 19237e1d..17dfcd78 100644
--- a/kpdf/xpdf/splash/SplashT1Font.cc
+++ b/kpdf/xpdf/splash/SplashT1Font.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashT1Font.cc
+// SplashT1Font.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.cc b/kpdf/xpdf/splash/SplashT1FontEngine.cpp
index 68530e88..d17dc47c 100644
--- a/kpdf/xpdf/splash/SplashT1FontEngine.cc
+++ b/kpdf/xpdf/splash/SplashT1FontEngine.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashT1FontEngine.cc
+// SplashT1FontEngine.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashT1FontFile.cc b/kpdf/xpdf/splash/SplashT1FontFile.cpp
index 54312055..b9f3ed3c 100644
--- a/kpdf/xpdf/splash/SplashT1FontFile.cc
+++ b/kpdf/xpdf/splash/SplashT1FontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashT1FontFile.cc
+// SplashT1FontFile.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashTypes.h b/kpdf/xpdf/splash/SplashTypes.h
index 35551b90..aa431b78 100644
--- a/kpdf/xpdf/splash/SplashTypes.h
+++ b/kpdf/xpdf/splash/SplashTypes.h
@@ -48,7 +48,7 @@ enum SplashColorMode {
 };
 
 // number of components in each color mode
-// (defined in SplashState.cc)
+// (defined in SplashState.cpp)
 extern int splashColorModeNComps[];
 
 // max number of components in any SplashColor
diff --git a/kpdf/xpdf/splash/SplashXPath.cc b/kpdf/xpdf/splash/SplashXPath.cpp
index 71481eff..267643bb 100644
--- a/kpdf/xpdf/splash/SplashXPath.cc
+++ b/kpdf/xpdf/splash/SplashXPath.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashXPath.cc
+// SplashXPath.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/splash/SplashXPathScanner.cc b/kpdf/xpdf/splash/SplashXPathScanner.cpp
index 97e5a9bc..8c7d505a 100644
--- a/kpdf/xpdf/splash/SplashXPathScanner.cc
+++ b/kpdf/xpdf/splash/SplashXPathScanner.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashXPathScanner.cc
+// SplashXPathScanner.cpp
 //
 //========================================================================
 
diff --git a/kpdf/xpdf/xpdf/Annot.cc b/kpdf/xpdf/xpdf/Annot.cpp
index 23df25df..10d3ce73 100644
--- a/kpdf/xpdf/xpdf/Annot.cc
+++ b/kpdf/xpdf/xpdf/Annot.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Annot.cc
+// Annot.cpp
 //
 // Copyright 2000-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Array.cc b/kpdf/xpdf/xpdf/Array.cpp
index 8232037b..7c54605a 100644
--- a/kpdf/xpdf/xpdf/Array.cc
+++ b/kpdf/xpdf/xpdf/Array.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Array.cc
+// Array.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/BuiltinFont.cc b/kpdf/xpdf/xpdf/BuiltinFont.cpp
index ce989571..6e9d2375 100644
--- a/kpdf/xpdf/xpdf/BuiltinFont.cc
+++ b/kpdf/xpdf/xpdf/BuiltinFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFont.cc
+// BuiltinFont.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/BuiltinFontTables.cc b/kpdf/xpdf/xpdf/BuiltinFontTables.cpp
index 9c362389..9779946f 100644
--- a/kpdf/xpdf/xpdf/BuiltinFontTables.cc
+++ b/kpdf/xpdf/xpdf/BuiltinFontTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFontTables.cc
+// BuiltinFontTables.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/CMakeLists.txt b/kpdf/xpdf/xpdf/CMakeLists.txt
index eb5e1762..bf9f329c 100644
--- a/kpdf/xpdf/xpdf/CMakeLists.txt
+++ b/kpdf/xpdf/xpdf/CMakeLists.txt
@@ -24,13 +24,14 @@ include_directories(
 
 tde_add_library( xpdf STATIC_PIC
   SOURCES
-    Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc
-    Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc
-    FontEncodingTables.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc
-    GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc
-    NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc
-    PDFDocEncoding.cc PreScanOutputDev.cc PSTokenizer.cc Page.cc
-    Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc
-    Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc
-    UnicodeTypeTable.cc XRef.cc
+    Annot.cpp Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp
+    Catalog.cpp CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp
+    FontEncodingTables.cpp Function.cpp Gfx.cpp GfxFont.cpp GfxState.cpp
+    GlobalParams.cpp JArithmeticDecoder.cpp JBIG2Stream.cpp Lexer.cpp Link.cpp
+    NameToCharCode.cpp Object.cpp Outline.cpp OutputDev.cpp PDFDoc.cpp
+    PDFDocEncoding.cpp PreScanOutputDev.cpp PSTokenizer.cpp Page.cpp
+    Parser.cpp PSOutputDev.cpp SecurityHandler.cpp SplashOutputDev.cpp
+    Stream.cpp JPXStream.cpp TextOutputDev.cpp UnicodeMap.cpp
+    UnicodeTypeTable.cpp XRef.cpp
+  LINK ${FONTCONFIG_LIBRARIES}
 )
diff --git a/kpdf/xpdf/xpdf/CMap.cc b/kpdf/xpdf/xpdf/CMap.cpp
index 89905a8c..dfad915f 100644
--- a/kpdf/xpdf/xpdf/CMap.cc
+++ b/kpdf/xpdf/xpdf/CMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CMap.cc
+// CMap.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Catalog.cc b/kpdf/xpdf/xpdf/Catalog.cpp
index 198703a4..ce64af09 100644
--- a/kpdf/xpdf/xpdf/Catalog.cc
+++ b/kpdf/xpdf/xpdf/Catalog.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Catalog.cc
+// Catalog.cpp
 //
 // Copyright 1996-2007 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/CharCodeToUnicode.cc b/kpdf/xpdf/xpdf/CharCodeToUnicode.cpp
index 3702a16d..1144caec 100644
--- a/kpdf/xpdf/xpdf/CharCodeToUnicode.cc
+++ b/kpdf/xpdf/xpdf/CharCodeToUnicode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CharCodeToUnicode.cc
+// CharCodeToUnicode.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Decrypt.cc b/kpdf/xpdf/xpdf/Decrypt.cpp
index 51e56fb1..97fa0bd6 100644
--- a/kpdf/xpdf/xpdf/Decrypt.cc
+++ b/kpdf/xpdf/xpdf/Decrypt.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Decrypt.cc
+// Decrypt.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Dict.cc b/kpdf/xpdf/xpdf/Dict.cpp
index dd1517f0..593e9a11 100644
--- a/kpdf/xpdf/xpdf/Dict.cc
+++ b/kpdf/xpdf/xpdf/Dict.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Dict.cc
+// Dict.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/FontEncodingTables.cc b/kpdf/xpdf/xpdf/FontEncodingTables.cpp
index f3b9280a..4cd1affe 100644
--- a/kpdf/xpdf/xpdf/FontEncodingTables.cc
+++ b/kpdf/xpdf/xpdf/FontEncodingTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FontEncodingTables.cc
+// FontEncodingTables.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Function.cc b/kpdf/xpdf/xpdf/Function.cpp
index eaf8e974..f36c8f6c 100644
--- a/kpdf/xpdf/xpdf/Function.cc
+++ b/kpdf/xpdf/xpdf/Function.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Function.cc
+// Function.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Gfx.cc b/kpdf/xpdf/xpdf/Gfx.cpp
index e3df8384..2a4fdb6e 100644
--- a/kpdf/xpdf/xpdf/Gfx.cc
+++ b/kpdf/xpdf/xpdf/Gfx.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Gfx.cc
+// Gfx.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/GfxFont.cc b/kpdf/xpdf/xpdf/GfxFont.cpp
index 8694be47..4298b41c 100644
--- a/kpdf/xpdf/xpdf/GfxFont.cc
+++ b/kpdf/xpdf/xpdf/GfxFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxFont.cc
+// GfxFont.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/GfxState.cc b/kpdf/xpdf/xpdf/GfxState.cpp
index a00dabe1..f7cb1ce9 100644
--- a/kpdf/xpdf/xpdf/GfxState.cc
+++ b/kpdf/xpdf/xpdf/GfxState.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxState.cc
+// GfxState.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/GfxState.h b/kpdf/xpdf/xpdf/GfxState.h
index f85643dc..52c5c93c 100644
--- a/kpdf/xpdf/xpdf/GfxState.h
+++ b/kpdf/xpdf/xpdf/GfxState.h
@@ -114,7 +114,7 @@ struct GfxCMYK {
 //------------------------------------------------------------------------
 
 // NB: The nGfxColorSpaceModes constant and the gfxColorSpaceModeNames
-// array defined in GfxState.cc must match this enum.
+// array defined in GfxState.cpp must match this enum.
 enum GfxColorSpaceMode {
   csDeviceGray,
   csCalGray,
diff --git a/kpdf/xpdf/xpdf/GlobalParams.cc b/kpdf/xpdf/xpdf/GlobalParams.cpp
index 6212f42e..f18026ee 100644
--- a/kpdf/xpdf/xpdf/GlobalParams.cc
+++ b/kpdf/xpdf/xpdf/GlobalParams.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GlobalParams.cc
+// GlobalParams.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/JArithmeticDecoder.cc b/kpdf/xpdf/xpdf/JArithmeticDecoder.cpp
index 195b73e1..7f7c7685 100644
--- a/kpdf/xpdf/xpdf/JArithmeticDecoder.cc
+++ b/kpdf/xpdf/xpdf/JArithmeticDecoder.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JArithmeticDecoder.cc
+// JArithmeticDecoder.cpp
 //
 // Copyright 2002-2004 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/JBIG2Stream.cc b/kpdf/xpdf/xpdf/JBIG2Stream.cpp
index 43f17712..1a4058f8 100644
--- a/kpdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/kpdf/xpdf/xpdf/JBIG2Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JBIG2Stream.cc
+// JBIG2Stream.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/JPXStream.cc b/kpdf/xpdf/xpdf/JPXStream.cpp
index 54a9e103..93b46471 100644
--- a/kpdf/xpdf/xpdf/JPXStream.cc
+++ b/kpdf/xpdf/xpdf/JPXStream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JPXStream.cc
+// JPXStream.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Lexer.cc b/kpdf/xpdf/xpdf/Lexer.cpp
index 1ef37175..04eadef2 100644
--- a/kpdf/xpdf/xpdf/Lexer.cc
+++ b/kpdf/xpdf/xpdf/Lexer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Lexer.cc
+// Lexer.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Link.cc b/kpdf/xpdf/xpdf/Link.cpp
index ae2de537..69106e13 100644
--- a/kpdf/xpdf/xpdf/Link.cc
+++ b/kpdf/xpdf/xpdf/Link.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Link.cc
+// Link.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Makefile.am b/kpdf/xpdf/xpdf/Makefile.am
index 4c0593ad..b86e26b8 100644
--- a/kpdf/xpdf/xpdf/Makefile.am
+++ b/kpdf/xpdf/xpdf/Makefile.am
@@ -2,14 +2,14 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/
 
 libxpdf_la_LDFLAGS = $(all_libraries)
 libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la 
-libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
-     Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc \
-     FontEncodingTables.cc Function.cc Gfx.cc \
-     GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \
-     JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc \
-     OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PreScanOutputDev.cc PSTokenizer.cc \
-     Page.cc Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc Stream.cc JPXStream.cc \
-     TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc
+libxpdf_la_SOURCES = Annot.cpp Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp \
+     Catalog.cpp CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp \
+     FontEncodingTables.cpp Function.cpp Gfx.cpp \
+     GfxFont.cpp GfxState.cpp GlobalParams.cpp JArithmeticDecoder.cpp \
+     JBIG2Stream.cpp Lexer.cpp Link.cpp NameToCharCode.cpp Object.cpp Outline.cpp \
+     OutputDev.cpp PDFDoc.cpp PDFDocEncoding.cpp PreScanOutputDev.cpp PSTokenizer.cpp \
+     Page.cpp Parser.cpp PSOutputDev.cpp SecurityHandler.cpp SplashOutputDev.cpp Stream.cpp JPXStream.cpp \
+     TextOutputDev.cpp UnicodeMap.cpp UnicodeTypeTable.cpp XRef.cpp
 
 noinst_LTLIBRARIES = libxpdf.la
 
diff --git a/kpdf/xpdf/xpdf/NameToCharCode.cc b/kpdf/xpdf/xpdf/NameToCharCode.cpp
index 7ebf4e16..23779f05 100644
--- a/kpdf/xpdf/xpdf/NameToCharCode.cc
+++ b/kpdf/xpdf/xpdf/NameToCharCode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// NameToCharCode.cc
+// NameToCharCode.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Object.cc b/kpdf/xpdf/xpdf/Object.cpp
index f0a3a092..81760b44 100644
--- a/kpdf/xpdf/xpdf/Object.cc
+++ b/kpdf/xpdf/xpdf/Object.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Object.cc
+// Object.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Outline.cc b/kpdf/xpdf/xpdf/Outline.cpp
index 39e89a3c..f5aba636 100644
--- a/kpdf/xpdf/xpdf/Outline.cc
+++ b/kpdf/xpdf/xpdf/Outline.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Outline.cc
+// Outline.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/OutputDev.cc b/kpdf/xpdf/xpdf/OutputDev.cpp
index 3ba19973..1b394ad4 100644
--- a/kpdf/xpdf/xpdf/OutputDev.cc
+++ b/kpdf/xpdf/xpdf/OutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// OutputDev.cc
+// OutputDev.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PDFDoc.cc b/kpdf/xpdf/xpdf/PDFDoc.cpp
index dc24d97e..ee2bc4df 100644
--- a/kpdf/xpdf/xpdf/PDFDoc.cc
+++ b/kpdf/xpdf/xpdf/PDFDoc.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PDFDoc.cc
+// PDFDoc.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PDFDocEncoding.cc b/kpdf/xpdf/xpdf/PDFDocEncoding.cpp
index 89dc3828..89dc3828 100644
--- a/kpdf/xpdf/xpdf/PDFDocEncoding.cc
+++ b/kpdf/xpdf/xpdf/PDFDocEncoding.cpp
diff --git a/kpdf/xpdf/xpdf/PSOutputDev.cc b/kpdf/xpdf/xpdf/PSOutputDev.cpp
index 4fb2cbfd..9d1d7648 100644
--- a/kpdf/xpdf/xpdf/PSOutputDev.cc
+++ b/kpdf/xpdf/xpdf/PSOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSOutputDev.cc
+// PSOutputDev.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PSTokenizer.cc b/kpdf/xpdf/xpdf/PSTokenizer.cpp
index a959cc73..4898fe42 100644
--- a/kpdf/xpdf/xpdf/PSTokenizer.cc
+++ b/kpdf/xpdf/xpdf/PSTokenizer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSTokenizer.cc
+// PSTokenizer.cpp
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Page.cc b/kpdf/xpdf/xpdf/Page.cpp
index cfeab88b..de2fe6c0 100644
--- a/kpdf/xpdf/xpdf/Page.cc
+++ b/kpdf/xpdf/xpdf/Page.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Page.cc
+// Page.cpp
 //
 // Copyright 1996-2007 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Parser.cc b/kpdf/xpdf/xpdf/Parser.cpp
index 65a43d94..95475b85 100644
--- a/kpdf/xpdf/xpdf/Parser.cc
+++ b/kpdf/xpdf/xpdf/Parser.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Parser.cc
+// Parser.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/PreScanOutputDev.cc b/kpdf/xpdf/xpdf/PreScanOutputDev.cpp
index 52ffeb7f..e05cdc34 100644
--- a/kpdf/xpdf/xpdf/PreScanOutputDev.cc
+++ b/kpdf/xpdf/xpdf/PreScanOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PreScanOutputDev.cc
+// PreScanOutputDev.cpp
 //
 // Copyright 2005 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/SecurityHandler.cc b/kpdf/xpdf/xpdf/SecurityHandler.cpp
index ea0f9341..6c2abba0 100644
--- a/kpdf/xpdf/xpdf/SecurityHandler.cc
+++ b/kpdf/xpdf/xpdf/SecurityHandler.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SecurityHandler.cc
+// SecurityHandler.cpp
 //
 // Copyright 2004 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/SplashOutputDev.cc b/kpdf/xpdf/xpdf/SplashOutputDev.cpp
index fe235fb8..2de19e73 100644
--- a/kpdf/xpdf/xpdf/SplashOutputDev.cc
+++ b/kpdf/xpdf/xpdf/SplashOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashOutputDev.cc
+// SplashOutputDev.cpp
 //
 // Copyright 2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/Stream.cc b/kpdf/xpdf/xpdf/Stream.cpp
index 2c1db5b4..0d85a766 100644
--- a/kpdf/xpdf/xpdf/Stream.cc
+++ b/kpdf/xpdf/xpdf/Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Stream.cc
+// Stream.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/TextOutputDev.cc b/kpdf/xpdf/xpdf/TextOutputDev.cpp
index d2bfaf63..3387a31a 100644
--- a/kpdf/xpdf/xpdf/TextOutputDev.cc
+++ b/kpdf/xpdf/xpdf/TextOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// TextOutputDev.cc
+// TextOutputDev.cpp
 //
 // Copyright 1997-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/UnicodeMap.cc b/kpdf/xpdf/xpdf/UnicodeMap.cpp
index 2b8cb1f7..f3d18715 100644
--- a/kpdf/xpdf/xpdf/UnicodeMap.cc
+++ b/kpdf/xpdf/xpdf/UnicodeMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// UnicodeMap.cc
+// UnicodeMap.cpp
 //
 // Copyright 2001-2003 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/UnicodeTypeTable.cc b/kpdf/xpdf/xpdf/UnicodeTypeTable.cpp
index b8960403..39b9d842 100644
--- a/kpdf/xpdf/xpdf/UnicodeTypeTable.cc
+++ b/kpdf/xpdf/xpdf/UnicodeTypeTable.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// UnicodeTypeTable.cc
+// UnicodeTypeTable.cpp
 //
 // Copyright 2004 Glyph & Cog, LLC
 //
diff --git a/kpdf/xpdf/xpdf/XRef.cc b/kpdf/xpdf/xpdf/XRef.cpp
index 2e0d1cef..06a1c4e1 100644
--- a/kpdf/xpdf/xpdf/XRef.cc
+++ b/kpdf/xpdf/xpdf/XRef.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XRef.cc
+// XRef.cpp
 //
 // Copyright 1996-2003 Glyph & Cog, LLC
 //