116 files changed, 328 insertions, 1126 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/dlgperformance.ui b/kpdf/conf/dlgperformance.ui
index 3676c3ba..d0730717 100644
--- a/kpdf/conf/dlgperformance.ui
+++ b/kpdf/conf/dlgperformance.ui
@@ -265,11 +265,11 @@
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="local" impldecl="in implementation">dlgperformance.ui.h</include>
 </includes>
-<Q_SLOTS>
+<slots>
     <slot>lowRadio_toggled( bool on )</slot>
     <slot>normalRadio_toggled( bool on )</slot>
     <slot>aggressiveRadio_toggled( bool on )</slot>
-</Q_SLOTS>
+</slots>
 <functions>
     <function access="private">init()</function>
 </functions>
diff --git a/kpdf/conf/kpdf.kcfg b/kpdf/conf/kpdf.kcfg
index 9f54b412..c9c4f94f 100644
--- a/kpdf/conf/kpdf.kcfg
+++ b/kpdf/conf/kpdf.kcfg
@@ -6,7 +6,7 @@
  <kcfgfile name="kpdfpartrc" />
  <group name="Accessibility" >
   <entry key="PaperColor" type="Color" >
-   <default code="true" >Qt::white</default>
+   <default code="true" >TQt::white</default>
   </entry>
   <entry key="HighlightImages" type="Bool" >
    <default>false</default>
@@ -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>
@@ -126,7 +129,7 @@
    <default>false</default>
   </entry>
   <entry key="SlidesBackgroundColor" type="Color" >
-   <default code="true" >Qt::black</default>
+   <default code="true" >TQt::black</default>
   </entry>
   <entry key="SlidesTransition" type="Enum" >
    <default>Replace</default>
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index f97be985..97bc6706 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -204,7 +204,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con
     if ( !d->saveBookmarksTimer )
     {
         d->saveBookmarksTimer = new TQTimer( this );
-        connect( d->saveBookmarksTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( saveDocumentInfo() ) );
+        connect( d->saveBookmarksTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( saveDocumentInfo() ) );
     }
     d->saveBookmarksTimer->start( 5 * 60 * 1000 );
 
@@ -212,7 +212,7 @@ bool KPDFDocument::openDocument( const TQString & docFile, const KURL & url, con
     if ( !d->memCheckTimer )
     {
         d->memCheckTimer = new TQTimer( this );
-        connect( d->memCheckTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimedMemoryCheck() ) );
+        connect( d->memCheckTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimedMemoryCheck() ) );
     }
     d->memCheckTimer->start( 2000 );
 
@@ -357,7 +357,7 @@ void KPDFDocument::reparseConfig()
 
 TQWidget *KPDFDocument::widget() const
 {
-    return TQT_TQWIDGET(parent());
+    return static_cast<TQWidget*>(parent());
 }
 
 bool KPDFDocument::isOpened() const
diff --git a/kpdf/core/document.h b/kpdf/core/document.h
index a0529261..247a8dfd 100644
--- a/kpdf/core/document.h
+++ b/kpdf/core/document.h
@@ -49,7 +49,7 @@ class KURL;
  */
 class KPDFDocument : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         KPDFDocument( TQWidget *widget );
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 5c0046d3..08578a8e 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.cpp b/kpdf/part.cpp
index 65714b05..97f1b5b4 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -120,11 +120,11 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_actionsSearched(false), m_searchStarted(false)
 {
 	// connect the started signal to tell the job the mimetypes we like
-	connect(this, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(setMimeTypes(TDEIO::Job *)));
+	connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(setMimeTypes(TDEIO::Job *)));
 	
 	// connect the completed signal so we can put the window caption when loading remote files
-	connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(emitWindowCaption()));
-	connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(emitWindowCaption()));
+	connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(emitWindowCaption()));
+	connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(emitWindowCaption()));
 	
 	// load catalog for translation
 	TDEGlobal::locale()->insertCatalogue("kpdf");
@@ -144,17 +144,17 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 
 	// build the document
 	m_document = new KPDFDocument(widget());
-	connect( m_document, TQT_SIGNAL( linkFind() ), this, TQT_SLOT( slotFind() ) );
-	connect( m_document, TQT_SIGNAL( linkGoToPage() ), this, TQT_SLOT( slotGoToPage() ) );
-	connect( m_document, TQT_SIGNAL( linkPresentation() ), this, TQT_SLOT( slotShowPresentation() ) );
-	connect( m_document, TQT_SIGNAL( linkEndPresentation() ), this, TQT_SLOT( slotHidePresentation() ) );
-	connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
-	connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
+	connect( m_document, TQ_SIGNAL( linkFind() ), this, TQ_SLOT( slotFind() ) );
+	connect( m_document, TQ_SIGNAL( linkGoToPage() ), this, TQ_SLOT( slotGoToPage() ) );
+	connect( m_document, TQ_SIGNAL( linkPresentation() ), this, TQ_SLOT( slotShowPresentation() ) );
+	connect( m_document, TQ_SIGNAL( linkEndPresentation() ), this, TQ_SLOT( slotHidePresentation() ) );
+	connect( m_document, TQ_SIGNAL( openURL(const KURL &) ), this, TQ_SLOT( openURLFromDocument(const KURL &) ) );
+	connect( m_document, TQ_SIGNAL( close() ), this, TQ_SLOT( close() ) );
 	
 	if (parent && parent->metaObject()->slotNames(true).contains("slotQuit()"))
-		connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) );
+		connect( m_document, TQ_SIGNAL( quit() ), parent, TQ_SLOT( slotQuit() ) );
 	else
-		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
+		connect( m_document, TQ_SIGNAL( quit() ), this, TQ_SLOT( cannotQuit() ) );
 
 	// widgets: ^searchbar (toolbar containing label and SearchWidget)
 //	m_searchToolBar = new TDEToolBar( parentWidget, "searchBar" );
@@ -169,7 +169,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_splitter->setOpaqueResize( true );
 	setWidget( m_splitter );
 	
-	m_showLeftPanel = new TDEToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQT_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" );
+	m_showLeftPanel = new TDEToggleAction( i18n( "Show &Navigation Panel"), "show_side_panel", 0, this, TQ_SLOT( slotShowLeftPanel() ), actionCollection(), "show_leftpanel" );
 	m_showLeftPanel->setCheckedState( i18n( "Hide &Navigation Panel") );
 	m_showLeftPanel->setShortcut( "CTRL+L" );
 	m_showLeftPanel->setChecked( KpdfSettings::showLeftPanel() );
@@ -191,7 +191,7 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	TQVBoxLayout *tocWrapperLayout = new TQVBoxLayout(tocWrapper);
 	m_tocFrame = new TOC( tocWrapper, m_document );
 	tocWrapperLayout->add(m_tocFrame);
-	connect(m_tocFrame, TQT_SIGNAL(hasTOC(bool)), this, TQT_SLOT(enableTOC(bool)));
+	connect(m_tocFrame, TQ_SIGNAL(hasTOC(bool)), this, TQ_SLOT(enableTOC(bool)));
 	index = m_toolBox->addItem( tocWrapper, TQIconSet(SmallIcon("format-text-direction-ltr")), i18n("Contents") );
 	m_toolBox->setItemToolTip(index, i18n("Contents"));
 	enableTOC( false );
@@ -201,8 +201,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_searchWidget = new SearchWidget( thumbsBox, m_document );
 	m_thumbnailList = new ThumbnailList( thumbsBox, m_document );
 //	ThumbnailController * m_tc = new ThumbnailController( thumbsBox, m_thumbnailList );
-	connect( m_thumbnailList, TQT_SIGNAL( urlDropped( const KURL& ) ), TQT_SLOT( openURLFromDocument( const KURL & )) );
-	connect( m_thumbnailList, TQT_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQT_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) );
+	connect( m_thumbnailList, TQ_SIGNAL( urlDropped( const KURL& ) ), TQ_SLOT( openURLFromDocument( const KURL & )) );
+	connect( m_thumbnailList, TQ_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQ_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) );
 	// shrink the bottom controller toolbar (too hackish..)
 	thumbsBox->setStretchFactor( m_searchWidget, 100 );
 	thumbsBox->setStretchFactor( m_thumbnailList, 100 );
@@ -234,8 +234,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	m_pageView = new PageView( m_splitter, m_document );
 	m_pageView->setFocus(); //usability setting
 	m_splitter->setFocusProxy(m_pageView);
-	connect( m_pageView, TQT_SIGNAL( urlDropped( const KURL& ) ), TQT_SLOT( openURLFromDocument( const KURL & )));
-	connect( m_pageView, TQT_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQT_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) );
+	connect( m_pageView, TQ_SIGNAL( urlDropped( const KURL& ) ), TQ_SLOT( openURLFromDocument( const KURL & )));
+	connect( m_pageView, TQ_SIGNAL( rightClick(const KPDFPage *, const TQPoint &) ), this, TQ_SLOT( slotShowMenu(const KPDFPage *, const TQPoint &) ) );
 
 	// add document observers
 	m_document->addObserver( this );
@@ -248,53 +248,53 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	TDEActionCollection * ac = actionCollection();
 
 	// Page Traversal actions
-	m_gotoPage = KStdAction::gotoPage( this, TQT_SLOT( slotGoToPage() ), ac, "goto_page" );
+	m_gotoPage = KStdAction::gotoPage( this, TQ_SLOT( slotGoToPage() ), ac, "goto_page" );
 	m_gotoPage->setShortcut( "CTRL+G" );
 	// dirty way to activate gotopage when pressing miniBar's button
-	connect( m_miniBar, TQT_SIGNAL( gotoPage() ), m_gotoPage, TQT_SLOT( activate() ) );
+	connect( m_miniBar, TQ_SIGNAL( gotoPage() ), m_gotoPage, TQ_SLOT( activate() ) );
 
-	m_prevPage = KStdAction::prior(this, TQT_SLOT(slotPreviousPage()), ac, "previous_page");
+	m_prevPage = KStdAction::prior(this, TQ_SLOT(slotPreviousPage()), ac, "previous_page");
 	m_prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) );
 	m_prevPage->setShortcut( 0 );
 	// dirty way to activate prev page when pressing miniBar's button
-	connect( m_miniBar, TQT_SIGNAL( prevPage() ), m_prevPage, TQT_SLOT( activate() ) );
+	connect( m_miniBar, TQ_SIGNAL( prevPage() ), m_prevPage, TQ_SLOT( activate() ) );
 
-	m_nextPage = KStdAction::next(this, TQT_SLOT(slotNextPage()), ac, "next_page" );
+	m_nextPage = KStdAction::next(this, TQ_SLOT(slotNextPage()), ac, "next_page" );
 	m_nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) );
 	m_nextPage->setShortcut( 0 );
 	// dirty way to activate next page when pressing miniBar's button
-	connect( m_miniBar, TQT_SIGNAL( nextPage() ), m_nextPage, TQT_SLOT( activate() ) );
+	connect( m_miniBar, TQ_SIGNAL( nextPage() ), m_nextPage, TQ_SLOT( activate() ) );
 
-	m_firstPage = KStdAction::firstPage( this, TQT_SLOT( slotGotoFirst() ), ac, "first_page" );
+	m_firstPage = KStdAction::firstPage( this, TQ_SLOT( slotGotoFirst() ), ac, "first_page" );
 	m_firstPage->setWhatsThis( i18n( "Moves to the first page of the document" ) );
 
-	m_lastPage = KStdAction::lastPage( this, TQT_SLOT( slotGotoLast() ), ac, "last_page" );
+	m_lastPage = KStdAction::lastPage( this, TQ_SLOT( slotGotoLast() ), ac, "last_page" );
 	m_lastPage->setWhatsThis( i18n( "Moves to the last page of the document" ) );
 
-	m_historyBack = KStdAction::back( this, TQT_SLOT( slotHistoryBack() ), ac, "history_back" );
+	m_historyBack = KStdAction::back( this, TQ_SLOT( slotHistoryBack() ), ac, "history_back" );
 	m_historyBack->setWhatsThis( i18n( "Go to the place you were before" ) );
 
-	m_historyNext = KStdAction::forward( this, TQT_SLOT( slotHistoryNext() ), ac, "history_forward" );
+	m_historyNext = KStdAction::forward( this, TQ_SLOT( slotHistoryNext() ), ac, "history_forward" );
 	m_historyNext->setWhatsThis( i18n( "Go to the place you were after" ) );
 
 	// Find and other actions
-	m_find = KStdAction::find( this, TQT_SLOT( slotFind() ), ac, "find" );
+	m_find = KStdAction::find( this, TQ_SLOT( slotFind() ), ac, "find" );
 	m_find->setEnabled( false );
 
-	m_findNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac, "find_next" );
+	m_findNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac, "find_next" );
 	m_findNext->setEnabled( false );
 
-	m_saveAs = KStdAction::saveAs( this, TQT_SLOT( slotSaveFileAs() ), ac, "save" );
+	m_saveAs = KStdAction::saveAs( this, TQ_SLOT( slotSaveFileAs() ), ac, "save" );
 	m_saveAs->setEnabled( false );
-	TDEAction * prefs = KStdAction::preferences( this, TQT_SLOT( slotPreferences() ), ac, "preferences" );
+	TDEAction * prefs = KStdAction::preferences( this, TQ_SLOT( slotPreferences() ), ac, "preferences" );
 	prefs->setText( i18n( "Configure KPDF..." ) );
-	m_printPreview = KStdAction::printPreview( this, TQT_SLOT( slotPrintPreview() ), ac );
+	m_printPreview = KStdAction::printPreview( this, TQ_SLOT( slotPrintPreview() ), ac );
 	m_printPreview->setEnabled( false );
 
-	m_showProperties = new TDEAction(i18n("&Properties"), "application-vnd.tde.info", 0, this, TQT_SLOT(slotShowProperties()), ac, "properties");
+	m_showProperties = new TDEAction(i18n("&Properties"), "application-vnd.tde.info", 0, this, TQ_SLOT(slotShowProperties()), ac, "properties");
 	m_showProperties->setEnabled( false );
 
-	m_showPresentation = new TDEAction( i18n("P&resentation"), "application-x-kpresenter", "Ctrl+Shift+P", this, TQT_SLOT(slotShowPresentation()), ac, "presentation");
+	m_showPresentation = new TDEAction( i18n("P&resentation"), "application-x-kpresenter", "Ctrl+Shift+P", this, TQ_SLOT(slotShowPresentation()), ac, "presentation");
 	m_showPresentation->setEnabled( false );
 
 	// attach the actions of the children widgets too
@@ -313,11 +313,11 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	// by connecting to TQt4::TQSplitter's sliderMoved())
 	m_pageView->installEventFilter( this );
 	m_watcher = new KDirWatch( this );
-	connect( m_watcher, TQT_SIGNAL( dirty( const TQString& ) ), this, TQT_SLOT( slotFileDirty( const TQString& ) ) );
+	connect( m_watcher, TQ_SIGNAL( dirty( const TQString& ) ), this, TQ_SLOT( slotFileDirty( const TQString& ) ) );
 	m_dirtyHandler = new TQTimer( this );
-	connect( m_dirtyHandler, TQT_SIGNAL( timeout() ),this, TQT_SLOT( slotDoFileDirty() ) );
+	connect( m_dirtyHandler, TQ_SIGNAL( timeout() ),this, TQ_SLOT( slotDoFileDirty() ) );
 	m_saveSplitterSizeTimer = new TQTimer( this );
-	connect( m_saveSplitterSizeTimer, TQT_SIGNAL( timeout() ),this, TQT_SLOT( saveSplitterSize() ) );
+	connect( m_saveSplitterSizeTimer, TQ_SIGNAL( timeout() ),this, TQ_SLOT( saveSplitterSize() ) );
 
 	slotNewConfig();
 
@@ -432,7 +432,7 @@ bool Part::openFile()
                     *p << app;
                     *p << m_file << m_temporaryLocalFile;
                     m_pageView->showText(i18n("Converting from ps to pdf..."), 0);
-                    connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(psTransformEnded()));
+                    connect(p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(psTransformEnded()));
                     p -> start();
                     return true;
                 }
@@ -527,7 +527,7 @@ void Part::setMimeTypes(TDEIO::Job *job)
     if (job)
     {
         job->addMetaData("accept", "application/pdf, */*;q=0.5");
-        connect(job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), this, TQT_SLOT(readMimeType(TDEIO::Job*,const TQString&)));
+        connect(job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), this, TQ_SLOT(readMimeType(TDEIO::Job*,const TQString&)));
     }
 }
 
@@ -571,7 +571,7 @@ bool Part::closeURL()
 bool Part::eventFilter( TQObject * watched, TQEvent * e )
 {
     // if pageView has been resized, save splitter sizes
-    if ( TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(m_pageView) && e->type() == TQEvent::Resize )
+    if ( watched == m_pageView && e->type() == TQEvent::Resize )
         m_saveSplitterSizeTimer->start(500, true);
 
     // only intercept events, don't block them
@@ -830,7 +830,7 @@ void Part::slotPreferences()
     // we didn't find an instance of this dialog, so lets create it
     PreferencesDialog * dialog = new PreferencesDialog( m_pageView, KpdfSettings::self() );
     // keep us informed when the user changes settings
-    connect( dialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotNewConfig() ) );
+    connect( dialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotNewConfig() ) );
 
     dialog->show();
 }
diff --git a/kpdf/part.h b/kpdf/part.h
index 50be072f..aa3b6659 100644
--- a/kpdf/part.h
+++ b/kpdf/part.h
@@ -58,7 +58,7 @@ class BrowserExtension;
  */
 class Part : public KParts::ReadOnlyPart, public DocumentObserver, virtual public kpdf_dcop
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
@@ -196,7 +196,7 @@ private:
 
 class BrowserExtension : public KParts::BrowserExtension
 {
-Q_OBJECT
+TQ_OBJECT
   
 
 public:
@@ -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.cpp b/kpdf/shell/shell.cpp
index 209f8760..a0fdefdc 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -66,7 +66,7 @@ void Shell::init()
   {
     // now that the Part is loaded, we cast it to a Part to get
     // our hands on it
-    m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", TQT_TQOBJECT(this), 0, "KParts::ReadOnlyPart");
+    m_part = (KParts::ReadOnlyPart*) factory->createPart(this, "kpdf_part", this, 0, "KParts::ReadOnlyPart");
     if (m_part)
     {
       // then, setup our actions
@@ -87,9 +87,9 @@ void Shell::init()
     m_part = 0;
     return;
   }
-  connect( this, TQT_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQT_SLOT( restoreDocument(TDEConfig*)));
-  connect( this, TQT_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQT_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
-  connect( m_part, TQT_SIGNAL( enablePrintAction(bool) ), m_printAction, TQT_SLOT( setEnabled(bool)));
+  connect( this, TQ_SIGNAL( restoreDocument(TDEConfig*) ),m_part, TQ_SLOT( restoreDocument(TDEConfig*)));
+  connect( this, TQ_SIGNAL( saveDocumentRestoreInfo(TDEConfig*) ), m_part, TQ_SLOT( saveDocumentRestoreInfo(TDEConfig*)));
+  connect( m_part, TQ_SIGNAL( enablePrintAction(bool) ), m_printAction, TQ_SLOT( setEnabled(bool)));
   
   readSettings();
   if (!TDEGlobal::config()->hasGroup("MainWindow"))
@@ -99,7 +99,7 @@ void Shell::init()
   }
   setAutoSaveSettings();
   
-  if (m_openUrl.isValid()) TQTimer::singleShot(0, this, TQT_SLOT(delayedOpen()));
+  if (m_openUrl.isValid()) TQTimer::singleShot(0, this, TQ_SLOT(delayedOpen()));
 }
 
 void Shell::delayedOpen()
@@ -146,19 +146,19 @@ void Shell::writeSettings()
 
 void Shell::setupActions()
 {
-  TDEAction * openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-  m_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT( openURL( const KURL& ) ), actionCollection() );
-  connect( m_recent, TQT_SIGNAL( activated() ), openAction, TQT_SLOT( activate() ) );
+  TDEAction * openAction = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection());
+  m_recent = KStdAction::openRecent( this, TQ_SLOT( openURL( const KURL& ) ), actionCollection() );
+  connect( m_recent, TQ_SIGNAL( activated() ), openAction, TQ_SLOT( activate() ) );
   m_recent->setWhatsThis( i18n( "<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file" ) );
-  m_printAction = KStdAction::print( m_part, TQT_SLOT( slotPrint() ), actionCollection() );
+  m_printAction = KStdAction::print( m_part, TQ_SLOT( slotPrint() ), actionCollection() );
   m_printAction->setEnabled( false );
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection());
+  KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());
 
   setStandardToolBarMenuEnabled(true);
 
-  m_showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection());
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
+  m_showMenuBarAction = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenubar() ), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
+  m_fullScreenAction = KStdAction::fullScreen( this, TQ_SLOT( slotUpdateFullScreen() ), actionCollection(), this );
 }
 
 void Shell::saveProperties(TDEConfig* config)
@@ -197,7 +197,7 @@ Shell::fileOpen()
 Shell::optionsConfigureToolbars()
 {
   KEditToolbar dlg(factory());
-  connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig()));
+  connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(applyNewToolbarConfig()));
   dlg.exec();
 }
 
diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h
index 560be8fd..0784516f 100644
--- a/kpdf/shell/shell.h
+++ b/kpdf/shell/shell.h
@@ -35,7 +35,7 @@ namespace KPDF
    */
   class Shell : public KParts::MainWindow
   {
-    Q_OBJECT
+    TQ_OBJECT
   
 
   public:
@@ -109,5 +109,3 @@ namespace KPDF
 }
 
 #endif
-
-// vim:ts=2:sw=2:tw=78:et
diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index eaceeed2..f05b8931 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -121,10 +121,10 @@ MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document )
     setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
 
     // connect signals from child widgets to internal handlers / signals bouncers
-    connect( m_pagesEdit, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotChangePage() ) );
-    connect( m_pagesButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( gotoPage() ) );
-    connect( m_prevButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( prevPage() ) );
-    connect( m_nextButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( nextPage() ) );
+    connect( m_pagesEdit, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotChangePage() ) );
+    connect( m_pagesButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( gotoPage() ) );
+    connect( m_prevButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( prevPage() ) );
+    connect( m_nextButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( nextPage() ) );
 
     // widget starts hidden (will be shown after opening a document)
     parent->hide();
@@ -146,7 +146,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool
     if ( pages < 1 )
     {
         m_currentPage = -1;
-        TQT_TQWIDGET( parent() )->hide();
+        static_cast<TQWidget*>( parent() )->hide();
         return;
     }
 
@@ -171,7 +171,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool
     m_pagesButton->setText( TQString::number( pages ) );
     m_prevButton->setEnabled( false );
     m_nextButton->setEnabled( false );
-    TQT_TQWIDGET( parent() )->show();
+    static_cast<TQWidget*>( parent() )->show();
 }
 
 void MiniBar::notifyViewportChanged( bool /*smoothMove*/ )
@@ -275,13 +275,13 @@ void ProgressWidget::setProgress( float percentage )
 
 void ProgressWidget::mouseMoveEvent( TQMouseEvent * e )
 {
-    if ( e->state() == Qt::LeftButton && width() > 0 )
+    if ( e->state() == TQt::LeftButton && width() > 0 )
         m_miniBar->slotGotoNormalizedPage( (float)( TQApplication::reverseLayout() ? width() - e->x() : e->x() ) / (float)width() );
 }
 
 void ProgressWidget::mousePressEvent( TQMouseEvent * e )
 {
-    if ( e->button() == Qt::LeftButton && width() > 0 )
+    if ( e->button() == TQt::LeftButton && width() > 0 )
         m_miniBar->slotGotoNormalizedPage( (float)( TQApplication::reverseLayout() ? width() - e->x() : e->x() ) / (float)width() );
 }
 
@@ -333,7 +333,7 @@ PagesEdit::PagesEdit( MiniBar * parent )
     focusOutEvent( 0 );
 
     // use an integer validator
-    m_validator = new TQIntValidator( 1, 1, TQT_TQOBJECT(this) );
+    m_validator = new TQIntValidator( 1, 1, this );
     setValidator( m_validator );
 
     // customize text properties
diff --git a/kpdf/ui/minibar.h b/kpdf/ui/minibar.h
index 2d4ee4bb..29c117d5 100644
--- a/kpdf/ui/minibar.h
+++ b/kpdf/ui/minibar.h
@@ -24,7 +24,7 @@ class ProgressWidget;
  */
 class MiniBar : public TQFrame, public DocumentObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         MiniBar( TQWidget *parent, KPDFDocument * document );
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index 556512de..57f201a0 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;
 };
 
@@ -206,7 +207,7 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document )
 
     // widget setup: setup focus, accept drops and track mouse
     viewport()->setFocusProxy( this );
-    viewport()->setFocusPolicy( TQ_StrongFocus );
+    viewport()->setFocusPolicy( TQWidget::StrongFocus );
     //viewport()->setPaletteBackgroundColor( TQt::white );
     viewport()->setBackgroundMode( TQt::NoBackground );
     setResizePolicy( Manual );
@@ -215,8 +216,8 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document )
     viewport()->setMouseTracking( true );
 
     // conntect the padding of the viewport to pixmaps requests
-    connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) );
-    connect( &d->dragScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragScroll()) );
+    connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotRequestVisiblePixmaps(int, int)) );
+    connect( &d->dragScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragScroll()) );
 
     // set a corner button to resize the view to the page size
 //    TQPushButton * resizeButton = new TQPushButton( viewport() );
@@ -227,7 +228,7 @@ PageView::PageView( TQWidget *parent, KPDFDocument *document )
     setInputMethodEnabled( true );
 
     // schedule the welcome message
-    TQTimer::singleShot( 0, this, TQT_SLOT( slotShowWelcome() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( slotShowWelcome() ) );
 }
 
 PageView::~PageView()
@@ -245,63 +246,68 @@ PageView::~PageView()
 void PageView::setupActions( TDEActionCollection * ac )
 {
     // Zoom actions ( higher scales takes lots of memory! )
-    d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotZoom() ), ac, "zoom_to" );
+    d->aZoom = new TDESelectAction( i18n( "Zoom" ), "viewmag", 0, this, TQ_SLOT( slotZoom() ), ac, "zoom_to" );
     d->aZoom->setEditable( true );
 #if KDE_IS_VERSION(3,4,89)
     d->aZoom->setMaxComboViewCount( 13 );
 #endif
     updateZoomText();
 
-    KStdAction::zoomIn( TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), ac, "zoom_in" );
+    KStdAction::zoomIn( this, TQ_SLOT( slotZoomIn() ), ac, "zoom_in" );
 
-    KStdAction::zoomOut( TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), ac, "zoom_out" );
+    KStdAction::zoomOut( this, TQ_SLOT( slotZoomOut() ), ac, "zoom_out" );
 
     d->aZoomFitWidth = new TDEToggleAction( i18n("Fit to Page &Width"), "view_fit_width", 0, ac, "zoom_fit_width" );
-    connect( d->aZoomFitWidth, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToWidthToggled( bool ) ) );
+    connect( d->aZoomFitWidth, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotFitToWidthToggled( bool ) ) );
 
     d->aZoomFitPage = new TDEToggleAction( i18n("Fit to &Page"), "view_fit_window", 0, ac, "zoom_fit_page" );
-    connect( d->aZoomFitPage, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToPageToggled( bool ) ) );
+    connect( d->aZoomFitPage, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotFitToPageToggled( bool ) ) );
 
     d->aZoomFitText = new TDEToggleAction( i18n("Fit to &Text"), "zoom-fit-best", 0, ac, "zoom_fit_text" );
-    connect( d->aZoomFitText, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotFitToTextToggled( bool ) ) );
+    connect( d->aZoomFitText, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotFitToTextToggled( bool ) ) );
 
     // rotate actions
     TDEAction *action;
     action = new TDEAction( i18n("Rotate Right"), "object-rotate-right", TDEShortcut( "Ctrl+Shift++" ),
-                          TQT_TQOBJECT(this), TQT_SLOT( slotRotateRight() ), ac, "rotate_right" );
+                          this, TQ_SLOT( slotRotateRight() ), ac, "rotate_right" );
 
     action = new TDEAction( i18n("Rotate Left"), "object-rotate-left", TDEShortcut( "Ctrl+Shift+-" ),
-                          TQT_TQOBJECT(this), TQT_SLOT( slotRotateLeft() ), ac, "rotate_left" );
+                          this, TQ_SLOT( slotRotateLeft() ), ac, "rotate_left" );
 
     // View-Layout actions
     d->aViewTwoPages = new TDEToggleAction( i18n("&Two Pages"), "view_left_right", 0, ac, "view_twopages" );
-    connect( d->aViewTwoPages, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotTwoPagesToggled( bool ) ) );
+    connect( d->aViewTwoPages, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotTwoPagesToggled( bool ) ) );
     d->aViewTwoPages->setChecked( KpdfSettings::viewColumns() > 1 );
 
     d->aViewContinuous = new TDEToggleAction( i18n("&Continuous"), "view_text", 0, ac, "view_continuous" );
-    connect( d->aViewContinuous, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotContinuousToggled( bool ) ) );
+    connect( d->aViewContinuous, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotContinuousToggled( bool ) ) );
     d->aViewContinuous->setChecked( KpdfSettings::viewContinuous() );
 
+    d->aViewCoverPage = new TDEToggleAction( i18n("Co&ver Page"), "contents2", 0, ac, "view_coverpage" );
+    connect( d->aViewCoverPage, TQ_SIGNAL( toggled( bool ) ), TQ_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 = new TDERadioAction( i18n("&Browse Tool"), "input-mouse", 0, this, TQ_SLOT( slotSetMouseNormal() ), ac, "mouse_drag" );
     d->aMouseNormal->setExclusiveGroup( "MouseType" );
     d->aMouseNormal->setChecked( true );
 
-    TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" );
+    TDEToggleAction * mz = new TDERadioAction( i18n("&Zoom Tool"), "viewmag", 0, this, TQ_SLOT( slotSetMouseZoom() ), ac, "mouse_zoom" );
     mz->setExclusiveGroup( "MouseType" );
 
-    d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseSelect() ), ac, "mouse_select" );
+    d->aMouseSelect = new TDERadioAction( i18n("&Select Tool"), "frame_edit", 0, this, TQ_SLOT( slotSetMouseSelect() ), ac, "mouse_select" );
     d->aMouseSelect->setExclusiveGroup( "MouseType" );
 
-/*    d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" );
+/*    d->aMouseEdit = new TDERadioAction( i18n("Draw"), "edit", 0, this, TQ_SLOT( slotSetMouseDraw() ), ac, "mouse_draw" );
     d->aMouseEdit->setExclusiveGroup("MouseType");
     d->aMouseEdit->setEnabled( false ); // implement feature before removing this line*/
 
     // Other actions
-    TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollUp() ), ac, "view_scroll_up" );
+    TDEAction * su = new TDEAction( i18n("Scroll Up"), 0, this, TQ_SLOT( slotScrollUp() ), ac, "view_scroll_up" );
     su->setShortcut( "Shift+Up" );
 
-    TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, TQT_TQOBJECT(this), TQT_SLOT( slotScrollDown() ), ac, "view_scroll_down" );
+    TDEAction * sd = new TDEAction( i18n("Scroll Down"), 0, this, TQ_SLOT( slotScrollDown() ), ac, "view_scroll_down" );
     sd->setShortcut( "Shift+Down" );
 }
 
@@ -348,7 +354,7 @@ void PageView::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool do
         // Need slotRelayoutPages() here instead of d->dirtyLayout = true
         // because opening a pdf from another pdf will not trigger a viewportchange
         // so pages are never relayouted
-        TQTimer::singleShot(0, this, TQT_SLOT(slotRelayoutPages()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotRelayoutPages()));
     else
     {
         // update the mouse cursor when closing because we may have close through a link and
@@ -431,8 +437,8 @@ void PageView::notifyViewportChanged( bool smoothMove )
         if ( !d->viewportMoveTimer )
         {
             d->viewportMoveTimer = new TQTimer( this );
-            connect( d->viewportMoveTimer, TQT_SIGNAL( timeout() ),
-                     this, TQT_SLOT( slotMoveViewport() ) );
+            connect( d->viewportMoveTimer, TQ_SIGNAL( timeout() ),
+                     this, TQ_SLOT( slotMoveViewport() ) );
         }
         d->viewportMoveTimer->start( 25 );
         verticalScrollBar()->setEnabled( false );
@@ -637,7 +643,7 @@ void PageView::viewportResizeEvent( TQResizeEvent * )
     if ( !d->delayResizeTimer )
     {
         d->delayResizeTimer = new TQTimer( this );
-        connect( d->delayResizeTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRelayoutPages() ) );
+        connect( d->delayResizeTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRelayoutPages() ) );
     }
     d->delayResizeTimer->start( 333, true );
 }
@@ -719,7 +725,7 @@ void PageView::keyPressEvent( TQKeyEvent * e )
         {
             // create the timer on demand
             d->findTimeoutTimer = new TQTimer( this );
-            connect( d->findTimeoutTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( findAheadStop() ) );
+            connect( d->findTimeoutTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( findAheadStop() ) );
         }
         d->findTimeoutTimer->start( 3000, true );
         // it is needed to grab the keyboard becase people may have Space assigned to a 
@@ -840,7 +846,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
         return;
 
     // if holding mouse mid button, perform zoom
-    if ( (e->state() & Qt::MidButton) && d->mouseMidStartY >= 0 )
+    if ( (e->state() & TQt::MidButton) && d->mouseMidStartY >= 0 )
     {
         int deltaY = d->mouseMidStartY - e->globalPos().y();
         d->mouseMidStartY = e->globalPos().y();
@@ -851,8 +857,8 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e )
         return;
     }
 
-    bool leftButton = e->state() & Qt::LeftButton,
-         rightButton = e->state() & Qt::RightButton;
+    bool leftButton = e->state() & TQt::LeftButton,
+         rightButton = e->state() & TQt::RightButton;
     switch ( d->mouseMode )
     {
         case MouseNormal:
@@ -920,7 +926,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
     }
 
     // if pressing mid mouse button while not doing other things, begin 'comtinous zoom' mode
-    if ( e->button() & Qt::MidButton )
+    if ( e->button() & TQt::MidButton )
     {
         d->mouseMidStartY = e->globalPos().y();
         setCursor( KCursor::sizeVerCursor() );
@@ -931,8 +937,8 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e )
     d->mousePressPos = e->globalPos();
 
     // handle mode dependant mouse press actions
-    bool leftButton = e->button() & Qt::LeftButton,
-         rightButton = e->button() & Qt::RightButton;
+    bool leftButton = e->button() & TQt::LeftButton,
+         rightButton = e->button() & TQt::RightButton;
     switch ( d->mouseMode )
     {
         case MouseNormal:   // drag start / click / link following
@@ -973,7 +979,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
     if ( d->items.isEmpty() )
     {
         // ..except for right Clicks (emitted even it viewport is empty)
-        if ( e->button() == Qt::RightButton )
+        if ( e->button() == TQt::RightButton )
             emit rightClick( 0, e->globalPos() );
         return;
     }
@@ -983,7 +989,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
         return;
 
     // handle mode indepent mid buttom zoom
-    bool midButton = e->button() & Qt::MidButton;
+    bool midButton = e->button() & TQt::MidButton;
     if ( midButton && d->mouseMidStartY > 0 )
     {
         d->mouseMidStartY = -1;
@@ -992,8 +998,8 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
         return;
     }
 
-    bool leftButton = e->button() & Qt::LeftButton,
-         rightButton = e->button() & Qt::RightButton;
+    bool leftButton = e->button() & TQt::LeftButton,
+         rightButton = e->button() & TQt::RightButton;
     switch ( d->mouseMode )
     {
         case MouseNormal:{
@@ -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++;
@@ -1981,7 +2004,7 @@ void PageView::slotAutoScoll()
     if ( !d->autoScrollTimer )
     {
         d->autoScrollTimer = new TQTimer( this );
-        connect( d->autoScrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScoll() ) );
+        connect( d->autoScrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScoll() ) );
     }
 
     // if scrollIncrement is zero, stop the timer
@@ -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..4072713d 100644
--- a/kpdf/ui/pageview.h
+++ b/kpdf/ui/pageview.h
@@ -38,7 +38,7 @@ class PageViewTip;
  */
 class PageView : public TQScrollView, public DocumentObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
         friend class PageViewTip;
@@ -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/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index 91a9de8d..90d90472 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -24,7 +24,7 @@
 PageViewMessage::PageViewMessage( TQWidget * parent )
     : TQWidget( parent, "pageViewMessage" ), m_timer( 0 )
 {
-    setFocusPolicy( TQ_NoFocus );
+    setFocusPolicy( TQWidget::NoFocus );
     setBackgroundMode( NoBackground );
     setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background));
     // if the layout is LtR, we can safely place it in the right position
@@ -131,7 +131,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
         if ( !m_timer )
         {
             m_timer = new TQTimer( this );
-            connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) );
+            connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) );
         }
         m_timer->start( durationMs, true );
     } else if ( m_timer )
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 6dfd2a9d..65645400 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -61,7 +61,7 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc )
 
     m_width = -1;
 
-    m_accel = new TDEAccel( this, TQT_TQOBJECT(this), "presentationmode-accel" );
+    m_accel = new TDEAccel( this, this, "presentationmode-accel" );
 
     // show widget and take control
     showFullScreen();
@@ -69,11 +69,11 @@ PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc )
     // misc stuff
     setMouseTracking( true );
     m_transitionTimer = new TQTimer( this );
-    connect( m_transitionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransitionStep() ) );
+    connect( m_transitionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransitionStep() ) );
     m_overlayHideTimer = new TQTimer( this );
-    connect( m_overlayHideTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotHideOverlay() ) );
+    connect( m_overlayHideTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotHideOverlay() ) );
     m_nextPageTimer = new TQTimer( this );
-    connect( m_nextPageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotNextPage() ) );
+    connect( m_nextPageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotNextPage() ) );
 
     // handle cursor appearance as specified in configuration
     if ( KpdfSettings::slidesCursor() == KpdfSettings::EnumSlidesCursor::HiddenDelay )
@@ -100,11 +100,11 @@ PresentationWidget::~PresentationWidget()
 
 void PresentationWidget::setupActions( TDEActionCollection * ac )
 {
-    m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ), false, true );
-    m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ), false, true );
-    m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotFirstPage() ), false, true );
-    m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( slotLastPage() ), false, true );
-    m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), TQT_TQOBJECT(this), TQT_SLOT( close() ), false, true );
+    m_accel->insert( "previous_page", ac->action( "previous_page" )->shortcut(), this, TQ_SLOT( slotPrevPage() ), false, true );
+    m_accel->insert( "next_page", ac->action( "next_page" )->shortcut(), this, TQ_SLOT( slotNextPage() ), false, true );
+    m_accel->insert( "first_page", ac->action( "first_page" )->shortcut(), this, TQ_SLOT( slotFirstPage() ), false, true );
+    m_accel->insert( "last_page", ac->action( "last_page" )->shortcut(), this, TQ_SLOT( slotLastPage() ), false, true );
+    m_accel->insert( "presentation", ac->action( "presentation" )->shortcut(), this, TQ_SLOT( close() ), false, true );
 }
 
 void PresentationWidget::notifySetup( const TQValueVector< KPDFPage * > & pageSet, bool /*documentChanged*/ )
@@ -235,7 +235,7 @@ void PresentationWidget::wheelEvent( TQWheelEvent * e )
 void PresentationWidget::mousePressEvent( TQMouseEvent * e )
 {
     // pressing left button
-    if ( e->button() == Qt::LeftButton )
+    if ( e->button() == TQt::LeftButton )
     {
         // if pressing on a link, skip other checks
         if ( ( m_pressedLink = getLink( e->x(), e->y() ) ) )
@@ -252,14 +252,14 @@ void PresentationWidget::mousePressEvent( TQMouseEvent * e )
         slotNextPage();
     }
     // pressing right button
-    else if ( e->button() == Qt::RightButton )
+    else if ( e->button() == TQt::RightButton )
         slotPrevPage();
 }
 
 void PresentationWidget::mouseReleaseEvent( TQMouseEvent * e )
 {
     // if releasing on the same link we pressed over, execute it
-    if ( m_pressedLink && e->button() == Qt::LeftButton )
+    if ( m_pressedLink && e->button() == TQt::LeftButton )
     {
         const KPDFLink * link = getLink( e->x(), e->y() );
         if ( link == m_pressedLink )
@@ -290,7 +290,7 @@ void PresentationWidget::mouseMoveEvent( TQMouseEvent * e )
         if ( e->y() <= (geometry().top() + 1) )
             m_topBar->show();
         // handle "dragging the wheel" if clicking on its geometry
-        else if ( e->state() == Qt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
+        else if ( e->state() == TQt::LeftButton && m_overlayGeometry.contains( e->pos() ) )
             overlayClick( e->pos() );
     }
 }
@@ -307,9 +307,9 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
         m_topBar = new TDEToolBar( this, "presentationBar" );
         m_topBar->setIconSize( 32 );
         m_topBar->setMovingEnabled( false );
-        m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrevPage() ) );
-        m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotNextPage() ) );
-        m_topBar->insertButton( "system-log-out", 1, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( close() ) );
+        m_topBar->insertButton( TQApplication::reverseLayout() ? "1rightarrow" : "1leftarrow", 2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPrevPage() ) );
+        m_topBar->insertButton( TQApplication::reverseLayout() ? "1leftarrow" : "1rightarrow", 3, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNextPage() ) );
+        m_topBar->insertButton( "system-log-out", 1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() ) );
         m_topBar->setGeometry( 0, 0, m_width, 32 + 10 );
         m_topBar->alignItemRight( 1 );
         m_topBar->hide();
diff --git a/kpdf/ui/presentationwidget.h b/kpdf/ui/presentationwidget.h
index 177b3da0..e38332d7 100644
--- a/kpdf/ui/presentationwidget.h
+++ b/kpdf/ui/presentationwidget.h
@@ -34,7 +34,7 @@ class PresentationFrame;
  */
 class PresentationWidget : public TQDialog, public DocumentObserver
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         PresentationWidget( TQWidget * parent, KPDFDocument * doc );
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 8fcbfe22..f7c5b719 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -40,18 +40,18 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document )
 
     // a timer to ensure that we don't flood the document with requests to search
     m_inputDelayTimer = new TQTimer(this);
-    connect( m_inputDelayTimer, TQT_SIGNAL( timeout() ),
-             this, TQT_SLOT( startSearch() ) );
+    connect( m_inputDelayTimer, TQ_SIGNAL( timeout() ),
+             this, TQ_SLOT( startSearch() ) );
 
     // 1. text line
-    insertLined( TQString(), LEDIT_ID, TQT_SIGNAL( textChanged(const TQString &) ),
-                 TQT_TQOBJECT(this), TQT_SLOT( slotTextChanged(const TQString &) ), true,
+    insertLined( TQString(), LEDIT_ID, TQ_SIGNAL( textChanged(const TQString &) ),
+                 this, TQ_SLOT( slotTextChanged(const TQString &) ), true,
                  i18n( "Enter at least 3 letters to filter pages" ), 0/*size*/, 1 );
 
     // 2. clear button (uses a lineEdit slot, so it must be created after)
     insertButton( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
-                  CLEAR_ID, TQT_SIGNAL( clicked() ),
-                  TQT_TQOBJECT(getLined( LEDIT_ID )), TQT_SLOT( clear() ), true,
+                  CLEAR_ID, TQ_SIGNAL( clicked() ),
+                  getLined( LEDIT_ID ), TQ_SLOT( clear() ), true,
                   i18n( "Clear filter" ), 0/*index*/ );
 
     // 3.1. create the popup menu for changing filtering features
@@ -62,7 +62,7 @@ SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document )
     m_menu->insertItem( i18n("Match All Words"), 4 );
     m_menu->insertItem( i18n("Match Any Word"), 5 );
     m_menu->setItemChecked( 3, true );
-    connect( m_menu, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotMenuChaged(int) ) );
+    connect( m_menu, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotMenuChaged(int) ) );
 
     // 3.2. create the toolbar button that spawns the popup menu
     insertButton( "kpdf", FIND_ID, m_menu, true, i18n( "Filter Options" ), 2/*index*/ );
diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h
index c84db96f..16a492de 100644
--- a/kpdf/ui/searchwidget.h
+++ b/kpdf/ui/searchwidget.h
@@ -29,7 +29,7 @@ class m_inputDelayTimer;
  */
 class SearchWidget : public TDEToolBar
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
         SearchWidget( TQWidget *parent, KPDFDocument *document );
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index b443daa5..7d66cfb2 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -76,7 +76,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
 
 	// widget setup: can be focused by tab and mouse click (not wheel)
 	viewport()->setFocusProxy( this );
-	viewport()->setFocusPolicy( TQ_StrongFocus );
+	viewport()->setFocusPolicy( TQWidget::StrongFocus );
 	setResizePolicy( Manual );
 	setAcceptDrops( true );
 	setDragAutoScroll( false );
@@ -85,7 +85,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
 	viewport()->setPaletteBackgroundColor( palette().active().base() );
 
 	setFrameStyle( StyledPanel | Raised );
-	connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) );
+	connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotRequestVisiblePixmaps(int, int)) );
 }
 
 ThumbnailList::~ThumbnailList()
@@ -311,7 +311,7 @@ void ThumbnailList::keyPressEvent( TQKeyEvent * keyEvent )
 
 void ThumbnailList::contentsMousePressEvent( TQMouseEvent * e )
 {
-	if ( e->button() != Qt::LeftButton )
+	if ( e->button() != TQt::LeftButton )
 		return;
 	int clickY = e->y();
 	TQValueList<ThumbnailWidget *>::iterator vIt = m_visibleThumbnails.begin(), vEnd = m_visibleThumbnails.end();
@@ -444,7 +444,7 @@ void ThumbnailList::delayedRequestVisiblePixmaps( int delayMs )
 	if ( !m_delayTimer )
 	{
 		m_delayTimer = new TQTimer( this );
-		connect( m_delayTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotDelayTimeout() ) );
+		connect( m_delayTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotDelayTimeout() ) );
 	}
 	m_delayTimer->start( delayMs, true );
 }
@@ -479,7 +479,7 @@ void ThumbnailWidget::setSelected( bool selected )
 
 void ThumbnailWidget::mouseReleaseEvent( TQMouseEvent * e )
 {
-    if ( e->button() != Qt::RightButton )
+    if ( e->button() != TQt::RightButton )
         return;
 
     m_tl->forwardRightClick( m_page, e->globalPos() );
@@ -563,8 +563,8 @@ ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * lis
 
     // insert a togglebutton [show only bookmarked pages]
     //insertSeparator();
-    insertButton( "bookmark", FILTERB_ID, TQT_SIGNAL( toggled( bool ) ),
-                  TQT_TQOBJECT(list), TQT_SLOT( slotFilterBookmarks( bool ) ),
+    insertButton( "bookmark", FILTERB_ID, TQ_SIGNAL( toggled( bool ) ),
+                  list, TQ_SLOT( slotFilterBookmarks( bool ) ),
                   true, i18n( "Show bookmarked pages only" ) );
     setToggle( FILTERB_ID );
     setButton( FILTERB_ID, KpdfSettings::filterBookmarks() );
diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h
index b9fc06ae..b08a98f8 100644
--- a/kpdf/ui/thumbnaillist.h
+++ b/kpdf/ui/thumbnaillist.h
@@ -29,7 +29,7 @@ class ThumbnailWidget;
  */
 class ThumbnailList : public TQScrollView, public DocumentObserver
 {
-Q_OBJECT
+TQ_OBJECT
   
 	public:
 		ThumbnailList(TQWidget *parent, KPDFDocument *document);
diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp
index 00ac8eaf..e71f8746 100644
--- a/kpdf/ui/toc.cpp
+++ b/kpdf/ui/toc.cpp
@@ -67,8 +67,8 @@ TOC::TOC(TQWidget *parent, KPDFDocument *document) : TDEListView(parent), m_docu
     // the next line causes bug:147233
 //    setResizeMode(AllColumns);
     setAllColumnsShowFocus(true);
-    connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotExecuted(TQListViewItem *)));
-    connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), this, TQT_SLOT(slotExecuted(TQListViewItem *)));
+    connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotExecuted(TQListViewItem *)));
+    connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), this, TQ_SLOT(slotExecuted(TQListViewItem *)));
 }
 
 TOC::~TOC()
diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h
index 3de43502..9ed1d55c 100644
--- a/kpdf/ui/toc.h
+++ b/kpdf/ui/toc.h
@@ -19,7 +19,7 @@ class KPDFDocument;
 
 class TOC : public TDEListView, public DocumentObserver
 {
-Q_OBJECT
+TQ_OBJECT
   
     public:
         TOC(TQWidget *parent, KPDFDocument *document);
diff --git a/kpdf/xpdf/ConfigureChecks.cmake b/kpdf/xpdf/ConfigureChecks.cmake
index 6c4b5614..b15a82ef 100644
--- a/kpdf/xpdf/ConfigureChecks.cmake
+++ b/kpdf/xpdf/ConfigureChecks.cmake
@@ -21,20 +21,6 @@ if( NOT JPEG_FOUND )
 endif( )
 
 
-# check for t1lib
-if( WITH_T1LIB )
-  check_include_file( t1lib.h HAVE_T1LIB_H )
-  if( HAVE_T1LIB_H )
-    check_library_exists( t1 T1_InitLib "" HAVE_T1LIB )
-  endif( )
-  if( HAVE_T1LIB_H AND HAVE_T1LIB )
-    set( T1_LIBRARY t1 CACHE INTERNAL "" FORCE )
-  else( )
-    tde_message_fatal( "t1lib is required, but was not found on your system" )
-  endif( )
-endif( )
-
-
 # check for libpaper
 if( WITH_PAPER )
   check_include_file( paper.h HAVE_PAPER_H )
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..a99ceeb2 100644
--- a/kpdf/xpdf/splash/CMakeLists.txt
+++ b/kpdf/xpdf/splash/CMakeLists.txt
@@ -23,10 +23,10 @@ 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
+    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..5bf50df6 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 \
+	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..c3eb33a7 100644
--- a/kpdf/xpdf/splash/SplashFontEngine.cc
+++ b/kpdf/xpdf/splash/SplashFontEngine.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SplashFontEngine.cc
+// SplashFontEngine.cpp
 //
 //========================================================================
 
@@ -10,10 +10,6 @@
 #pragma implementation
 #endif
 
-#if HAVE_T1LIB_H
-#include <t1lib.h>
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #ifndef WIN32
@@ -22,7 +18,6 @@
 #include "gmem.h"
 #include "GString.h"
 #include "SplashMath.h"
-#include "SplashT1FontEngine.h"
 #include "SplashFTFontEngine.h"
 #include "SplashFontFile.h"
 #include "SplashFontFileID.h"
@@ -40,9 +35,6 @@ extern "C" int unlink(char *filename);
 //------------------------------------------------------------------------
 
 SplashFontEngine::SplashFontEngine(
-#if HAVE_T1LIB_H
-				   GBool enableT1lib,
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 				   GBool enableFreeType,
 #endif
@@ -53,13 +45,6 @@ SplashFontEngine::SplashFontEngine(
     fontCache[i] = NULL;
   }
 
-#if HAVE_T1LIB_H
-  if (enableT1lib) {
-    t1Engine = SplashT1FontEngine::init(aa);
-  } else {
-    t1Engine = NULL;
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (enableFreeType) {
     ftEngine = SplashFTFontEngine::init(aa);
@@ -78,11 +63,6 @@ SplashFontEngine::~SplashFontEngine() {
     }
   }
 
-#if HAVE_T1LIB_H
-  if (t1Engine) {
-    delete t1Engine;
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (ftEngine) {
     delete ftEngine;
@@ -111,11 +91,6 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA,
   SplashFontFile *fontFile;
 
   fontFile = NULL;
-#if HAVE_T1LIB_H
-  if (!fontFile && t1Engine) {
-    fontFile = t1Engine->loadType1Font(idA, src, enc);
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (!fontFile && ftEngine) {
     fontFile = ftEngine->loadType1Font(idA, src, enc);
@@ -138,11 +113,6 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA,
   SplashFontFile *fontFile;
 
   fontFile = NULL;
-#if HAVE_T1LIB_H
-  if (!fontFile && t1Engine) {
-    fontFile = t1Engine->loadType1CFont(idA, sec, enc);
-  }
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   if (!fontFile && ftEngine) {
     fontFile = ftEngine->loadType1CFont(idA, src, enc);
diff --git a/kpdf/xpdf/splash/SplashFontEngine.h b/kpdf/xpdf/splash/SplashFontEngine.h
index ace5e9ae..4718a208 100644
--- a/kpdf/xpdf/splash/SplashFontEngine.h
+++ b/kpdf/xpdf/splash/SplashFontEngine.h
@@ -15,7 +15,6 @@
 
 #include "gtypes.h"
 
-class SplashT1FontEngine;
 class SplashFTFontEngine;
 class SplashDTFontEngine;
 class SplashDT4FontEngine;
@@ -37,9 +36,6 @@ public:
 
   // Create a font engine.
   SplashFontEngine(
-#if HAVE_T1LIB_H
-		   GBool enableT1lib,
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 		   GBool enableFreeType,
 #endif
@@ -75,9 +71,6 @@ private:
 
   SplashFont *fontCache[splashFontCacheSize];
 
-#if HAVE_T1LIB_H
-  SplashT1FontEngine *t1Engine;
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
   SplashFTFontEngine *ftEngine;
 #endif
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.cc
deleted file mode 100644
index 19237e1d..00000000
--- a/kpdf/xpdf/splash/SplashT1Font.cc
+++ /dev/null
@@ -1,292 +0,0 @@
-//========================================================================
-//
-// SplashT1Font.cc
-//
-//========================================================================
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <stdlib.h>
-#include <t1lib.h>
-#include "gmem.h"
-#include "SplashMath.h"
-#include "SplashGlyphBitmap.h"
-#include "SplashPath.h"
-#include "SplashT1FontEngine.h"
-#include "SplashT1FontFile.h"
-#include "SplashT1Font.h"
-
-//------------------------------------------------------------------------
-
-static Guchar bitReverse[256] = {
-  0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-  0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-  0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-  0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-  0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-  0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-  0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-  0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-  0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-  0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-  0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-  0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-  0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-  0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-  0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-  0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-  0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-  0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-  0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-  0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-  0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-  0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-  0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-  0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-  0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-  0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-  0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-  0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-  0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-  0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-  0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-  0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
-};
-
-//------------------------------------------------------------------------
-// SplashT1Font
-//------------------------------------------------------------------------
-
-SplashT1Font::SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA,
-			   SplashCoord *textMatA):
-  SplashFont(fontFileA, matA, textMatA, fontFileA->engine->aa)
-{
-  T1_TMATRIX matrix;
-  BBox bbox;
-  SplashCoord bbx0, bby0, bbx1, bby1;
-  int x, y;
-
-  t1libID = T1_CopyFont(fontFileA->t1libID);
-  outlineID = -1;
-
-  // compute font size
-  size = (float)splashSqrt(mat[2]*mat[2] + mat[3]*mat[3]);
-
-  // transform the four corners of the font bounding box -- the min
-  // and max values form the bounding box of the transformed font
-  bbox = T1_GetFontBBox(t1libID);
-  bbx0 = 0.001 * bbox.llx;
-  bby0 = 0.001 * bbox.lly;
-  bbx1 = 0.001 * bbox.urx;
-  bby1 = 0.001 * bbox.ury;
-  // some fonts are completely broken, so we fake it (with values
-  // large enough that most glyphs should fit)
-  if (bbx0 == 0 && bby0 == 0 && bbx1 == 0 && bby1 == 0) {
-    bbx0 = bby0 = -0.5;
-    bbx1 = bby1 = 1.5;
-  }
-  x = (int)(mat[0] * bbx0 + mat[2] * bby0);
-  xMin = xMax = x;
-  y = (int)(mat[1] * bbx0 + mat[3] * bby0);
-  yMin = yMax = y;
-  x = (int)(mat[0] * bbx0 + mat[2] * bby1);
-  if (x < xMin) {
-    xMin = x;
-  } else if (x > xMax) {
-    xMax = x;
-  }
-  y = (int)(mat[1] * bbx0 + mat[3] * bby1);
-  if (y < yMin) {
-    yMin = y;
-  } else if (y > yMax) {
-    yMax = y;
-  }
-  x = (int)(mat[0] * bbx1 + mat[2] * bby0);
-  if (x < xMin) {
-    xMin = x;
-  } else if (x > xMax) {
-    xMax = x;
-  }
-  y = (int)(mat[1] * bbx1 + mat[3] * bby0);
-  if (y < yMin) {
-    yMin = y;
-  } else if (y > yMax) {
-    yMax = y;
-  }
-  x = (int)(mat[0] * bbx1 + mat[2] * bby1);
-  if (x < xMin) {
-    xMin = x;
-  } else if (x > xMax) {
-    xMax = x;
-  }
-  y = (int)(mat[1] * bbx1 + mat[3] * bby1);
-  if (y < yMin) {
-    yMin = y;
-  } else if (y > yMax) {
-    yMax = y;
-  }
-  // This is a kludge: some buggy PDF generators embed fonts with
-  // zero bounding boxes.
-  if (xMax == xMin) {
-    xMin = 0;
-    xMax = (int)size;
-  }
-  if (yMax == yMin) {
-    yMin = 0;
-    yMax = (int)(1.2 * size);
-  }
-  // Another kludge: an unusually large xMin or yMin coordinate is
-  // probably wrong.
-  if (xMin > 0) {
-    xMin = 0;
-  }
-  if (yMin > 0) {
-    yMin = 0;
-  }
-  // Another kludge: t1lib doesn't correctly handle fonts with
-  // real (non-integer) bounding box coordinates.
-  if (xMax - xMin > 5000) {
-    xMin = 0;
-    xMax = (int)size;
-  }
-  if (yMax - yMin > 5000) {
-    yMin = 0;
-    yMax = (int)(1.2 * size);
-  }
-
-  // transform the font
-  matrix.cxx = (double)mat[0] / size;
-  matrix.cxy = (double)mat[1] / size;
-  matrix.cyx = (double)mat[2] / size;
-  matrix.cyy = (double)mat[3] / size;
-  T1_TransformFont(t1libID, &matrix);
-}
-
-SplashT1Font::~SplashT1Font() {
-  T1_DeleteFont(t1libID);
-  if (outlineID >= 0) {
-    T1_DeleteFont(outlineID);
-  }
-}
-
-GBool SplashT1Font::getGlyph(int c, int xFrac, int yFrac,
-			     SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) {
-  return SplashFont::getGlyph(c, 0, 0, bitmap, x0, y0, clip, clipRes);
-}
-
-GBool SplashT1Font::makeGlyph(int c, int xFrac, int yFrac,
-			      SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) {
-  GLYPH *glyph;
-  int n, i;
-
-  if (aa) {
-    glyph = T1_AASetChar(t1libID, c, size, NULL);
-  } else {
-    glyph = T1_SetChar(t1libID, c, size, NULL);
-  }
-  if (!glyph) {
-    return gFalse;
-  }
-
-  bitmap->x = -glyph->metrics.leftSideBearing;
-  bitmap->y = glyph->metrics.ascent;
-  bitmap->w = glyph->metrics.rightSideBearing - glyph->metrics.leftSideBearing;
-  bitmap->h = glyph->metrics.ascent - glyph->metrics.descent;
-  bitmap->aa = aa;
-  if (aa) {
-    bitmap->data = (Guchar *)glyph->bits;
-    bitmap->freeData = gFalse;
-  } else {
-    n = bitmap->h * ((bitmap->w + 7) >> 3);
-    bitmap->data = (Guchar *)gmalloc(n);
-    for (i = 0; i < n; ++i) {
-      bitmap->data[i] = bitReverse[glyph->bits[i] & 0xff];
-    }
-    bitmap->freeData = gTrue;
-  }
-
-  *clipRes = clip->testRect(x0 - bitmap->x,
-                            y0 - bitmap->y,
-                            x0 - bitmap->x + bitmap->w - 1,
-                            y0 - bitmap->y + bitmap->h - 1);
-
-  return gTrue;
-}
-
-SplashPath *SplashT1Font::getGlyphPath(int c) {
-  T1_TMATRIX matrix;
-  SplashPath *path;
-  T1_OUTLINE *outline;
-  T1_PATHSEGMENT *seg;
-  T1_BEZIERSEGMENT *bez;
-  SplashCoord x, y, x1, y1;
-  GBool needClose;
-
-  if (outlineID < 0) {
-    outlineID = T1_CopyFont(((SplashT1FontFile *)fontFile)->t1libID);
-    outlineSize = (float)splashSqrt(textMat[2]*textMat[2] +
-				    textMat[3]*textMat[3]);
-    matrix.cxx = (double)textMat[0] / outlineSize;
-    matrix.cxy = (double)textMat[1] / outlineSize;
-    matrix.cyx = (double)textMat[2] / outlineSize;
-    matrix.cyy = (double)textMat[3] / outlineSize;
-    // t1lib doesn't seem to handle small sizes correctly here, so set
-    // the size to 1000, and scale the resulting coordinates later
-    outlineMul = (float)(outlineSize / 65536000.0);
-    outlineSize = 1000;
-    T1_TransformFont(outlineID, &matrix);
-  }
-
-  path = new SplashPath();
-  if ((outline = T1_GetCharOutline(outlineID, c, outlineSize, NULL))) {
-    x = 0;
-    y = 0;
-    needClose = gFalse;
-    for (seg = outline; seg; seg = seg->link) {
-      switch (seg->type) {
-      case T1_PATHTYPE_MOVE:
-	if (needClose) {
-	  path->close();
-	  needClose = gFalse;
-	}
-	x += seg->dest.x * outlineMul;
-	y += seg->dest.y * outlineMul;
-	path->moveTo(x, -y);
-	break;
-      case T1_PATHTYPE_LINE:
-	x += seg->dest.x * outlineMul;
-	y += seg->dest.y * outlineMul;
-	path->lineTo(x, -y);
-	needClose = gTrue;
-	break;
-      case T1_PATHTYPE_BEZIER:
-	bez = (T1_BEZIERSEGMENT *)seg;
-	x1 = x + (SplashCoord)(bez->dest.x * outlineMul);
-	y1 = y + (SplashCoord)(bez->dest.y * outlineMul);
-	path->curveTo(x + (SplashCoord)(bez->B.x * outlineMul),
-		      -(y + (SplashCoord)(bez->B.y * outlineMul)),
-		      x + (SplashCoord)(bez->C.x * outlineMul),
-		      -(y + (SplashCoord)(bez->C.y * outlineMul)),
-		      x1, -y1);
-	x = x1;
-	y = y1;
-	needClose = gTrue;
-	break;
-      }
-    }
-    if (needClose) {
-      path->close();
-    }
-    T1_FreeOutline(outline);
-  }
-
-  return path;
-}
-
-#endif // HAVE_T1LIB_H
diff --git a/kpdf/xpdf/splash/SplashT1Font.h b/kpdf/xpdf/splash/SplashT1Font.h
deleted file mode 100644
index 129c6ad5..00000000
--- a/kpdf/xpdf/splash/SplashT1Font.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//========================================================================
-//
-// SplashT1Font.h
-//
-//========================================================================
-
-#ifndef SPLASHT1FONT_H
-#define SPLASHT1FONT_H
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "SplashFont.h"
-
-class SplashT1FontFile;
-
-//------------------------------------------------------------------------
-// SplashT1Font
-//------------------------------------------------------------------------
-
-class SplashT1Font: public SplashFont {
-public:
-
-  SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA,
-	       SplashCoord *textMatA);
-
-  virtual ~SplashT1Font();
-
-  // Munge xFrac and yFrac before calling SplashFont::getGlyph.
-  virtual GBool getGlyph(int c, int xFrac, int yFrac,
-			 SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes);
-
-  // Rasterize a glyph.  The <xFrac> and <yFrac> values are the same
-  // as described for getGlyph.
-  virtual GBool makeGlyph(int c, int xFrac, int yFrac,
-			  SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes);
-
-  // Return the path for a glyph.
-  virtual SplashPath *getGlyphPath(int c);
-
-private:
-
-  int t1libID;			// t1lib font ID
-  int outlineID;		// t1lib font ID for glyph outlines
-  float size;
-  float outlineSize;		// size for glyph outlines
-  float outlineMul;
-};
-
-#endif // HAVE_T1LIB_H
-
-#endif
diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.cc b/kpdf/xpdf/splash/SplashT1FontEngine.cc
deleted file mode 100644
index 68530e88..00000000
--- a/kpdf/xpdf/splash/SplashT1FontEngine.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-//========================================================================
-//
-// SplashT1FontEngine.cc
-//
-//========================================================================
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#ifndef WIN32
-#  include <unistd.h>
-#endif
-#include <t1lib.h>
-#include "GString.h"
-#include "gfile.h"
-#include "FoFiType1C.h"
-#include "SplashT1FontFile.h"
-#include "SplashT1FontEngine.h"
-
-#ifdef VMS
-#if (__VMS_VER < 70000000)
-extern "C" int unlink(char *filename);
-#endif
-#endif
-
-//------------------------------------------------------------------------
-
-int SplashT1FontEngine::t1libInitCount = 0;
-
-//------------------------------------------------------------------------
-
-static void fileWrite(void *stream, char *data, int len) {
-  fwrite(data, 1, len, (FILE *)stream);
-}
-
-//------------------------------------------------------------------------
-// SplashT1FontEngine
-//------------------------------------------------------------------------
-
-SplashT1FontEngine::SplashT1FontEngine(GBool aaA) {
-  aa = aaA;
-}
-
-SplashT1FontEngine *SplashT1FontEngine::init(GBool aaA) {
-  // grayVals[i] = round(i * 255 / 16)
-  static unsigned long grayVals[17] = {
-    0, 16, 32, 48, 64, 80, 96, 112, 128, 143, 159, 175, 191, 207, 223, 239, 255
-  };
-
-  //~ for multithreading: need a mutex here
-  if (t1libInitCount == 0) {
-    T1_SetBitmapPad(8);
-    if (!T1_InitLib(NO_LOGFILE | IGNORE_CONFIGFILE | IGNORE_FONTDATABASE |
-		    T1_NO_AFM)) {
-      return NULL;
-    }
-    if (aaA) {
-      T1_AASetBitsPerPixel(8);
-      T1_AASetLevel(T1_AA_HIGH);
-      T1_AAHSetGrayValues(grayVals);
-    } else {
-      T1_AANSetGrayValues(0, 1);
-    }
-  }
-  ++t1libInitCount;
-
-  return new SplashT1FontEngine(aaA);
-}
-
-SplashT1FontEngine::~SplashT1FontEngine() {
-  //~ for multithreading: need a mutex here
-  if (--t1libInitCount == 0) {
-    T1_CloseLib();
-  }
-}
-
-SplashFontFile *SplashT1FontEngine::loadType1Font(SplashFontFileID *idA,
-						  SplashFontSrc *src,
-						  char **enc) {
-  return SplashT1FontFile::loadType1Font(this, idA, fileName, deleteFile, enc);
-}
-
-SplashFontFile *SplashT1FontEngine::loadType1CFont(SplashFontFileID *idA,
-						   SplashFontSrc *src,
-						   char **enc) {
-  FoFiType1C *ff;
-  GString *tmpFileName;
-  FILE *tmpFile;
-  SplashFontFile *ret;
-  SplashFontSrc *newsrc;
-
-  if (src->isFile)
-    ff = FoFiType1C::load(src->fileName);
-  else
-    ff = new FoFiType1C(src->buf, src->bufLen, gFalse);
-  if (! ff)
-    return NULL;
-  }
-  tmpFileName = NULL;
-  if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) {
-    delete ff;
-    return NULL;
-  }
-  ff->convertToType1(NULL, NULL, gTrue, &fileWrite, tmpFile);
-  delete ff;
-  fclose(tmpFile);
-  newsrc = new SplashFontSrc;
-  newsrc->setFile(tmpFileName, gTrue);
-  delete tmpFileName;
-  ret = SplashT1FontFile::loadType1Font(this, idA, newsrc, enc);
-  newsrc->unref();
-  return ret;
-}
-
-#endif // HAVE_T1LIB_H
diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.h b/kpdf/xpdf/splash/SplashT1FontEngine.h
deleted file mode 100644
index 57a04487..00000000
--- a/kpdf/xpdf/splash/SplashT1FontEngine.h
+++ /dev/null
@@ -1,53 +0,0 @@
-//========================================================================
-//
-// SplashT1FontEngine.h
-//
-//========================================================================
-
-#ifndef SPLASHT1FONTENGINE_H
-#define SPLASHT1FONTENGINE_H
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "gtypes.h"
-
-class SplashFontFile;
-class SplashFontFileID;
-
-//------------------------------------------------------------------------
-// SplashT1FontEngine
-//------------------------------------------------------------------------
-
-class SplashT1FontEngine {
-public:
-
-  static SplashT1FontEngine *init(GBool aaA);
-
-  ~SplashT1FontEngine();
-
-  // Load fonts.
-  SplashFontFile *loadType1Font(SplashFontFileID *idA, char *fileName,
-				GBool deleteFile, char **enc);
-  SplashFontFile *loadType1CFont(SplashFontFileID *idA, char *fileName,
-				 GBool deleteFile, char **enc);
-
-private:
-
-  SplashT1FontEngine(GBool aaA);
-
-  static int t1libInitCount;
-  GBool aa;
-
-  friend class SplashT1FontFile;
-  friend class SplashT1Font;
-};
-
-#endif // HAVE_T1LIB_H
-
-#endif
diff --git a/kpdf/xpdf/splash/SplashT1FontFile.cc b/kpdf/xpdf/splash/SplashT1FontFile.cc
deleted file mode 100644
index 54312055..00000000
--- a/kpdf/xpdf/splash/SplashT1FontFile.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-//========================================================================
-//
-// SplashT1FontFile.cc
-//
-//========================================================================
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma implementation
-#endif
-
-#include <string.h>
-#include <t1lib.h>
-#include "gmem.h"
-#include "SplashT1FontEngine.h"
-#include "SplashT1Font.h"
-#include "SplashT1FontFile.h"
-
-//------------------------------------------------------------------------
-// SplashT1FontFile
-//------------------------------------------------------------------------
-
-SplashFontFile *SplashT1FontFile::loadType1Font(SplashT1FontEngine *engineA,
-						SplashFontFileID *idA,
-						SplashFontSrc *src,
-						char **encA) {
-  int t1libIDA;
-  char **encTmp;
-  char *encStrTmp;
-  int encStrSize;
-  char *encPtr;
-  int i;
-
-  GString *fileNameA;
-  SplashFontSrc *newsrc = NULL;
-  SplashFontFile *ff;
-
-  if (! src->isFile) {
-    GString *tmpFileName;
-    FILE *tmpFile;
-    if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL))
-      return NULL;
-    fwrite(src->buf, 1, src->bufLen, tmpFile);
-    fclose(tmpFile);
-    newsrc = new SplashFontSrc;
-    newsrc->setFile(tmpFileName, gTrue);
-    src = newsrc;
-    delete tmpFileName;
-  }
-  fileNameA = src->fileName;
-  // load the font file
-  if ((t1libIDA = T1_AddFont(fileNameA)) < 0) {
-    delete newsrc;
-    return NULL;
-  }
-  T1_LoadFont(t1libIDA);
-
-  // reencode it
-  encStrSize = 0;
-  for (i = 0; i < 256; ++i) {
-    if (encA[i]) {
-      encStrSize += strlen(encA[i]) + 1;
-    }
-  }
-  encTmp = (char **)gmallocn(257, sizeof(char *));
-  encStrTmp = (char *)gmallocn(encStrSize, sizeof(char));
-  encPtr = encStrTmp;
-  for (i = 0; i < 256; ++i) {
-    if (encA[i]) {
-      strcpy(encPtr, encA[i]);
-      encTmp[i] = encPtr;
-      encPtr += strlen(encPtr) + 1;
-    } else {
-      encTmp[i] = ".notdef";
-    }
-  }
-  encTmp[256] = "custom";
-  T1_ReencodeFont(t1libIDA, encTmp);
-
-  ff = new SplashT1FontFile(engineA, idA, src,
- 			      t1libIDA, encTmp, encStrTmp);
-  if (newsrc)
-    newsrc->unref();
-  return ff;
-}
-
-SplashT1FontFile::SplashT1FontFile(SplashT1FontEngine *engineA,
-				   SplashFontFileID *idA,
-				   SplashFontSrc *srcA,
-				   int t1libIDA, char **encA, char *encStrA):
-  SplashFontFile(idA, srcA)
-{
-  engine = engineA;
-  t1libID = t1libIDA;
-  enc = encA;
-  encStr = encStrA;
-}
-
-SplashT1FontFile::~SplashT1FontFile() {
-  gfree(encStr);
-  gfree(enc);
-  T1_DeleteFont(t1libID);
-}
-
-SplashFont *SplashT1FontFile::makeFont(SplashCoord *mat,
-				       SplashCoord *textMat) {
-  SplashFont *font;
-
-  font = new SplashT1Font(this, mat, textMat);
-  font->initCache();
-  return font;
-}
-
-#endif // HAVE_T1LIB_H
diff --git a/kpdf/xpdf/splash/SplashT1FontFile.h b/kpdf/xpdf/splash/SplashT1FontFile.h
deleted file mode 100644
index 4dc93cbf..00000000
--- a/kpdf/xpdf/splash/SplashT1FontFile.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//========================================================================
-//
-// SplashT1FontFile.h
-//
-//========================================================================
-
-#ifndef SPLASHT1FONTFILE_H
-#define SPLASHT1FONTFILE_H
-
-#include <aconf.h>
-
-#if HAVE_T1LIB_H
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "SplashFontFile.h"
-
-class SplashT1FontEngine;
-
-//------------------------------------------------------------------------
-// SplashT1FontFile
-//------------------------------------------------------------------------
-
-class SplashT1FontFile: public SplashFontFile {
-public:
-
-  static SplashFontFile *loadType1Font(SplashT1FontEngine *engineA,
-				       SplashFontFileID *idA,
-				       char *fileNameA,
-				       char **encA);
-
-  virtual ~SplashT1FontFile();
-
-  // Create a new SplashT1Font, i.e., a scaled instance of this font
-  // file.
-  virtual SplashFont *makeFont(SplashCoord *mat,
-			       SplashCoord *textMat);
-
-private:
-
-  SplashT1FontFile(SplashT1FontEngine *engineA,
-		   SplashFontFileID *idA,
-		   char *fileNameA,
-		   int t1libIDA, char **encA, char *encStrA);
-
-  SplashT1FontEngine *engine;
-  int t1libID;			// t1lib font ID
-  char **enc;
-  char *encStr;
-
-  friend class SplashT1Font;
-};
-
-#endif // HAVE_T1LIB_H
-
-#endif
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..d98a0ce5 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
 //
@@ -713,7 +713,6 @@ GlobalParams::GlobalParams(char *cfgFileName) {
   fontDirs = new GList();
   initialZoom = new GString("125");
   continuousView = gFalse;
-  enableT1lib = gTrue;
   enableFreeType = gTrue;
   antialias = gTrue;
   vectorAntialias = gTrue;
@@ -1073,8 +1072,6 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) {
       parseInitialZoom(tokens, fileName, line);
     } else if (!cmd->cmp("continuousView")) {
       parseYesNo("continuousView", &continuousView, tokens, fileName, line);
-    } else if (!cmd->cmp("enableT1lib")) {
-      parseYesNo("enableT1lib", &enableT1lib, tokens, fileName, line);
     } else if (!cmd->cmp("enableFreeType")) {
       parseYesNo("enableFreeType", &enableFreeType, tokens, fileName, line);
     } else if (!cmd->cmp("antialias")) {
@@ -1125,9 +1122,9 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) {
 	  !cmd->cmp("displayNamedCIDFontX") ||
 	  !cmd->cmp("displayCIDFontX")) {
 	error(-1, "-- Xpdf no longer supports X fonts");
-      } else if (!cmd->cmp("t1libControl") || !cmd->cmp("freetypeControl")) {
-	error(-1, "-- The t1libControl and freetypeControl options have been replaced");
-	error(-1, "   by the enableT1lib, enableFreeType, and antialias options");
+      } else if (!cmd->cmp("freetypeControl")) {
+	error(-1, "-- The freetypeControl option has been replaced");
+	error(-1, "   by the enableFreeType, and antialias options");
       } else if (!cmd->cmp("fontpath") || !cmd->cmp("fontmap")) {
 	error(-1, "-- the config file format has changed since Xpdf 0.9x");
       }
@@ -2094,7 +2091,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
 	if (res != FcResultMatch || !s)  goto fin; 
 	ext = rindex((char*)s,'.');
 	if (!ext) goto fin;
-	if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4)) {
+	if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4) || !strncasecmp(ext,".otf",4)) {
 	  dfp = new DisplayFontParam(fontName->copy(), displayFontTT);
 	  dfp->tt.fileName = new GString((char*)s);
 	  FcPatternGetInteger(m, FC_INDEX, 0, &(dfp->tt.faceIndex));
@@ -2395,15 +2392,6 @@ GBool GlobalParams::getContinuousView() {
   return f;
 }
 
-GBool GlobalParams::getEnableT1lib() {
-  GBool f;
-
-  lockGlobalParams;
-  f = enableT1lib;
-  unlockGlobalParams;
-  return f;
-}
-
 GBool GlobalParams::getEnableFreeType() {
   GBool f;
 
@@ -2827,15 +2815,6 @@ void GlobalParams::setContinuousView(GBool cont) {
   unlockGlobalParams;
 }
 
-GBool GlobalParams::setEnableT1lib(char *s) {
-  GBool ok;
-
-  lockGlobalParams;
-  ok = parseYesNo2(s, &enableT1lib);
-  unlockGlobalParams;
-  return ok;
-}
-
 GBool GlobalParams::setEnableFreeType(char *s) {
   GBool ok;
 
diff --git a/kpdf/xpdf/xpdf/GlobalParams.h b/kpdf/xpdf/xpdf/GlobalParams.h
index c0543eda..85b3c27d 100644
--- a/kpdf/xpdf/xpdf/GlobalParams.h
+++ b/kpdf/xpdf/xpdf/GlobalParams.h
@@ -242,7 +242,6 @@ public:
   GString *findFontFile(GString *fontName, char **exts);
   GString *getInitialZoom();
   GBool getContinuousView();
-  GBool getEnableT1lib();
   GBool getEnableFreeType();
   GBool getAntialias();
   GBool getVectorAntialias();
@@ -294,7 +293,6 @@ public:
   void setTextKeepTinyChars(GBool keep);
   void setInitialZoom(char *s);
   void setContinuousView(GBool cont);
-  GBool setEnableT1lib(char *s);
   GBool setEnableFreeType(char *s);
   GBool setAntialias(char *s);
   GBool setVectorAntialias(char *s);
@@ -424,7 +422,6 @@ private:
   GList *fontDirs;		// list of font dirs [GString]
   GString *initialZoom;		// initial zoom level
   GBool continuousView;		// continuous view mode
-  GBool enableT1lib;		// t1lib enable flag
   GBool enableFreeType;		// FreeType enable flag
   GBool antialias;		// font anti-aliasing enable flag
   GBool vectorAntialias;	// vector anti-aliasing enable flag
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..20898701 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
 //
@@ -694,9 +694,6 @@ void SplashOutputDev::startDoc(XRef *xrefA) {
     delete fontEngine;
   }
   fontEngine = new SplashFontEngine(
-#if HAVE_T1LIB_H
-				    globalParams->getEnableT1lib(),
-#endif
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
 				    globalParams->getEnableFreeType(),
 #endif
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
 //
diff --git a/kpdf/xpdf/xpdf/xpdf_config.h b/kpdf/xpdf/xpdf/xpdf_config.h
index 81d4dd07..f00a6381 100644
--- a/kpdf/xpdf/xpdf/xpdf_config.h
+++ b/kpdf/xpdf/xpdf/xpdf_config.h
@@ -74,7 +74,7 @@
 // default maximum size of color cube to allocate
 #define defaultRGBCube 5
 
-// number of fonts (combined t1lib, FreeType, X server) to cache
+// number of fonts (combined FreeType, X server) to cache
 #define xOutFontCacheSize 64
 
 // number of Type 3 fonts to cache