From 2e25fa39cd67cca2472d3eabdb478feb517d72a5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:03:37 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kpovmodeler/kdoc.rules                  | 2 +-
 kpovmodeler/pmblendmapmodifiersedit.cpp | 2 +-
 kpovmodeler/pmbumpmapedit.cpp           | 2 +-
 kpovmodeler/pmcontrolpoint.cpp          | 2 +-
 kpovmodeler/pmdialogeditbase.cpp        | 2 +-
 kpovmodeler/pmdockwidget.cpp            | 2 +-
 kpovmodeler/pmdocumentationmap.cpp      | 2 +-
 kpovmodeler/pmerrordialog.cpp           | 2 +-
 kpovmodeler/pmfiledialog.cpp            | 2 +-
 kpovmodeler/pmfiledialog.h              | 2 +-
 kpovmodeler/pmglview.cpp                | 2 +-
 kpovmodeler/pmheightfieldedit.cpp       | 2 +-
 kpovmodeler/pmimagemapedit.cpp          | 2 +-
 kpovmodeler/pmlibrarybrowser.cpp        | 4 ++--
 kpovmodeler/pmlibraryentrypreview.cpp   | 2 +-
 kpovmodeler/pmlibraryhandleedit.cpp     | 4 ++--
 kpovmodeler/pmlibraryiconview.cpp       | 2 +-
 kpovmodeler/pmlibrarymanager.cpp        | 2 +-
 kpovmodeler/pmmaterialmapedit.cpp       | 2 +-
 kpovmodeler/pmobjectlibrarysettings.cpp | 2 +-
 kpovmodeler/pmpalettevalueedit.cpp      | 2 +-
 kpovmodeler/pmpart.cpp                  | 6 +++---
 kpovmodeler/pmpatternedit.cpp           | 2 +-
 kpovmodeler/pmpluginmanager.cpp         | 2 +-
 kpovmodeler/pmpovrayoutputwidget.cpp    | 2 +-
 kpovmodeler/pmpovrayrenderwidget.cpp    | 2 +-
 kpovmodeler/pmpovraysettings.cpp        | 2 +-
 kpovmodeler/pmpovraywidget.cpp          | 4 ++--
 kpovmodeler/pmrendermanager.cpp         | 2 +-
 kpovmodeler/pmrendermodesdialog.cpp     | 4 ++--
 kpovmodeler/pmsettingsdialog.cpp        | 2 +-
 kpovmodeler/pmshell.cpp                 | 2 +-
 kpovmodeler/pmtextedit.cpp              | 2 +-
 kpovmodeler/pmview.cpp                  | 2 +-
 kpovmodeler/pmviewlayoutmanager.cpp     | 2 +-
 35 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'kpovmodeler')

diff --git a/kpovmodeler/kdoc.rules b/kpovmodeler/kdoc.rules
index ca8abb0d..87e9cc96 100644
--- a/kpovmodeler/kdoc.rules
+++ b/kpovmodeler/kdoc.rules
@@ -6,5 +6,5 @@
 kde_MODULES = kpovmodeler
 
 kpovmodeler_FILES = *.h 
-kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -lkfile -lkio -lqt -p
+kpovmodeler_LIBS = -ltdeui -ltdeparts -ltdecore -ldcop -ltdefile -lkio -lqt -p
 kpovmodeler_PATH = .
\ No newline at end of file
diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp
index fd443623..ab3634c8 100644
--- a/kpovmodeler/pmblendmapmodifiersedit.cpp
+++ b/kpovmodeler/pmblendmapmodifiersedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp
index 5a4bf298..cdf14a44 100644
--- a/kpovmodeler/pmbumpmapedit.cpp
+++ b/kpovmodeler/pmbumpmapedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMBumpMapEdit::PMBumpMapEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmcontrolpoint.cpp b/kpovmodeler/pmcontrolpoint.cpp
index 70cab9d4..a6b5a497 100644
--- a/kpovmodeler/pmcontrolpoint.cpp
+++ b/kpovmodeler/pmcontrolpoint.cpp
@@ -19,7 +19,7 @@
 #include "pmdefaults.h"
 #include "pmdebug.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 double PMControlPoint::s_moveGrid = c_defaultMoveGrid;
 double PMControlPoint::s_scaleGrid = c_defaultScaleGrid;
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index d56d1b2b..73bec441 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -26,7 +26,7 @@
 #include <tqbuffer.h>
 #include <tqptrdict.h>
 #include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index e3e3c7b4..d92ab0bc 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqstyle.h>
 
 #ifndef NO_KDE2
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <ktoolbar.h>
 #include <kpopupmenu.h>
diff --git a/kpovmodeler/pmdocumentationmap.cpp b/kpovmodeler/pmdocumentationmap.cpp
index 2ee43a02..40e23d24 100644
--- a/kpovmodeler/pmdocumentationmap.cpp
+++ b/kpovmodeler/pmdocumentationmap.cpp
@@ -17,7 +17,7 @@
 
 #include "pmdocumentationmap.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>
diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp
index a8e84afc..f2b4ee62 100644
--- a/kpovmodeler/pmerrordialog.cpp
+++ b/kpovmodeler/pmerrordialog.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtextedit.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 TQSize PMErrorDialog::s_size = TQSize( 150, 200 );
diff --git a/kpovmodeler/pmfiledialog.cpp b/kpovmodeler/pmfiledialog.cpp
index 96085f19..8cee6b3a 100644
--- a/kpovmodeler/pmfiledialog.cpp
+++ b/kpovmodeler/pmfiledialog.cpp
@@ -19,7 +19,7 @@
 #include "pmfiledialog.h"
 #include "pmpart.h"
 
-#include <kfilefiltercombo.h>
+#include <tdefilefiltercombo.h>
 
 
 PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal )
diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h
index b45ce050..454cf1f8 100644
--- a/kpovmodeler/pmfiledialog.h
+++ b/kpovmodeler/pmfiledialog.h
@@ -24,7 +24,7 @@
 #endif
 
 #include "pmiomanager.h"
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 class PMPart;
 
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 7bd9c0be..71e7eafa 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -38,7 +38,7 @@
 
 #include <kxmlguifactory.h>
 #include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp
index cc413acf..851d6200 100644
--- a/kpovmodeler/pmheightfieldedit.cpp
+++ b/kpovmodeler/pmheightfieldedit.cpp
@@ -29,7 +29,7 @@
 #include <tqslider.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp
index 206d39a7..c2d7ff88 100644
--- a/kpovmodeler/pmimagemapedit.cpp
+++ b/kpovmodeler/pmimagemapedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMImageMapEdit::PMImageMapEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp
index f53d4301..71d5b89d 100644
--- a/kpovmodeler/pmlibrarybrowser.cpp
+++ b/kpovmodeler/pmlibrarybrowser.cpp
@@ -25,10 +25,10 @@
 #include <tqtimer.h>
 #include <tqpushbutton.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
 #include <kdiroperator.h>
diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp
index 0ccfd5b4..86ea01e4 100644
--- a/kpovmodeler/pmlibraryentrypreview.cpp
+++ b/kpovmodeler/pmlibraryentrypreview.cpp
@@ -37,7 +37,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
    TQWidget( parent )
diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp
index 4629a388..17620df2 100644
--- a/kpovmodeler/pmlibraryhandleedit.cpp
+++ b/kpovmodeler/pmlibraryhandleedit.cpp
@@ -26,9 +26,9 @@
 #include <tqlabel.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "pmlineedits.h"
 #include "pmdialogeditbase.h"
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 757162ec..a0661059 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -24,7 +24,7 @@
 #include <tqdir.h>
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmlibrarymanager.cpp b/kpovmodeler/pmlibrarymanager.cpp
index cf9c6f96..4429a88b 100644
--- a/kpovmodeler/pmlibrarymanager.cpp
+++ b/kpovmodeler/pmlibrarymanager.cpp
@@ -17,7 +17,7 @@
 
 #include "pmlibrarymanager.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 
diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp
index 491f9d76..8ec346dd 100644
--- a/kpovmodeler/pmmaterialmapedit.cpp
+++ b/kpovmodeler/pmmaterialmapedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp
index 47a38435..6dd1488c 100644
--- a/kpovmodeler/pmobjectlibrarysettings.cpp
+++ b/kpovmodeler/pmobjectlibrarysettings.cpp
@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 
diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp
index ca029887..84a98e83 100644
--- a/kpovmodeler/pmpalettevalueedit.cpp
+++ b/kpovmodeler/pmpalettevalueedit.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name ) 
       : TQWidget( parent, name )
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index f58b87a3..7ca0a555 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -32,15 +32,15 @@
 
 // include files for KDE
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kaction.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <kfilterdev.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 // application specific includes
 #include "pmpart.h"
diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp
index eb65727f..13c39c21 100644
--- a/kpovmodeler/pmpatternedit.cpp
+++ b/kpovmodeler/pmpatternedit.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 
 PMPatternEdit::PMPatternEdit( TQWidget* parent, const char* name )
diff --git a/kpovmodeler/pmpluginmanager.cpp b/kpovmodeler/pmpluginmanager.cpp
index f7313675..a9c86a1b 100644
--- a/kpovmodeler/pmpluginmanager.cpp
+++ b/kpovmodeler/pmpluginmanager.cpp
@@ -26,7 +26,7 @@
 
 #include <tdeparts/plugin.h>
 #include <kxmlguifactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 PMPluginManager* PMPluginManager::s_pInstance = 0;
 KStaticDeleter<PMPluginManager> PMPluginManager::s_staticDeleter;
diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp
index 39c125d6..7ac52131 100644
--- a/kpovmodeler/pmpovrayoutputwidget.cpp
+++ b/kpovmodeler/pmpovrayoutputwidget.cpp
@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp
index a47d66b0..8235e161 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -23,7 +23,7 @@
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <ktempfile.h>
 #include <tqcolor.h>
diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp
index 3ceaa83b..40153ce8 100644
--- a/kpovmodeler/pmpovraysettings.cpp
+++ b/kpovmodeler/pmpovraysettings.cpp
@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name )
       : PMSettingsDialogPage( parent, name )
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index e077de69..c28b48b9 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -23,9 +23,9 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kglobalsettings.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp
index 2e56662a..746f64b9 100644
--- a/kpovmodeler/pmrendermanager.cpp
+++ b/kpovmodeler/pmrendermanager.cpp
@@ -35,7 +35,7 @@
 #include <tqbitmap.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <time.h>
diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp
index e787616c..346f2219 100644
--- a/kpovmodeler/pmrendermodesdialog.cpp
+++ b/kpovmodeler/pmrendermodesdialog.cpp
@@ -29,9 +29,9 @@
 #include <tqcombobox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "pmlineedits.h"
 
diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp
index ade88b40..4bb6c568 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -35,7 +35,7 @@
 #include <tqvbox.h>
 #include <tqlistview.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 //#define KPM_WITH_OBJECT_LIBRARY
diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp
index 13148682..35cd78cf 100644
--- a/kpovmodeler/pmshell.cpp
+++ b/kpovmodeler/pmshell.cpp
@@ -20,7 +20,7 @@
 #include <kstdaction.h>
 #include <kaction.h>
 #include <kstatusbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp
index e1e4e038..2ea76346 100644
--- a/kpovmodeler/pmtextedit.cpp
+++ b/kpovmodeler/pmtextedit.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 PMTextEdit::PMTextEdit( TQWidget* parent, const char* name )
       : Base( parent, name )
diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp
index a774aa28..c791375b 100644
--- a/kpovmodeler/pmview.cpp
+++ b/kpovmodeler/pmview.cpp
@@ -21,7 +21,7 @@
 #include <tqsplitter.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 
diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp
index fe3a031d..b6d72b3c 100644
--- a/kpovmodeler/pmviewlayoutmanager.cpp
+++ b/kpovmodeler/pmviewlayoutmanager.cpp
@@ -20,7 +20,7 @@
 #include "pmviewlayoutmanager.h"
 #include "pmdockwidget_private.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kfilterdev.h>
-- 
cgit v1.2.1