diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:59:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:59:16 -0600 |
| commit | 8c1f69b6dc559d1482ee597522544283f2452729 (patch) | |
| tree | b28eeb7c72e8f9ab2ac89dbec002dc2d25610d1e /kipi-plugins/mpegencoder | |
| parent | 705b68800b569de2d07f0eca755bf19e6441556d (diff) | |
| download | kipi-plugins-8c1f69b6dc559d1482ee597522544283f2452729.tar.gz kipi-plugins-8c1f69b6dc559d1482ee597522544283f2452729.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/mpegencoder')
| -rw-r--r-- | kipi-plugins/mpegencoder/checkbinprog.cpp | 2 | ||||
| -rw-r--r-- | kipi-plugins/mpegencoder/kimg2mpg.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/mpegencoder/kimg2mpg.h | 2 | ||||
| -rw-r--r-- | kipi-plugins/mpegencoder/kimg2mpgbase.ui | 4 | ||||
| -rw-r--r-- | kipi-plugins/mpegencoder/optionsdialog.cpp | 2 | ||||
| -rw-r--r-- | kipi-plugins/mpegencoder/plugin_mpegencoder.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp index 23aeb01..9f620cf 100644 --- a/kipi-plugins/mpegencoder/checkbinprog.cpp +++ b/kipi-plugins/mpegencoder/checkbinprog.cpp @@ -32,7 +32,7 @@ // KDElib includes #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kurl.h> #include <kmessagebox.h> diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp index 2763354..3da82dd 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.cpp +++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp @@ -67,8 +67,8 @@ extern "C" #include <kprogress.h> #include <kprocess.h> #include <klocale.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kcolordialog.h> #include <klineedit.h> #include <kcolorbutton.h> diff --git a/kipi-plugins/mpegencoder/kimg2mpg.h b/kipi-plugins/mpegencoder/kimg2mpg.h index f4cc783..9d1f177 100644 --- a/kipi-plugins/mpegencoder/kimg2mpg.h +++ b/kipi-plugins/mpegencoder/kimg2mpg.h @@ -37,7 +37,7 @@ #include <kdialog.h> #include <klistbox.h> #include <kprocess.h> -#include <kio/previewjob.h> +#include <tdeio/previewjob.h> // Include files for KIPI diff --git a/kipi-plugins/mpegencoder/kimg2mpgbase.ui b/kipi-plugins/mpegencoder/kimg2mpgbase.ui index cd4563d..3d9408a 100644 --- a/kipi-plugins/mpegencoder/kimg2mpgbase.ui +++ b/kipi-plugins/mpegencoder/kimg2mpgbase.ui @@ -1288,12 +1288,12 @@ The program uses the 'images2mpg' bash script.</string> <include location="global" impldecl="in declaration">klineedit.h</include> <include location="global" impldecl="in declaration">libkipi/interface.h</include> <include location="global" impldecl="in declaration">kprocess.h</include> - <include location="global" impldecl="in declaration">kio/previewjob.h</include> + <include location="global" impldecl="in declaration">tdeio/previewjob.h</include> <include location="global" impldecl="in declaration">klistbox.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">libkipi/interface.h</include> <include location="global" impldecl="in implementation">kprocess.h</include> - <include location="global" impldecl="in implementation">kio/previewjob.h</include> + <include location="global" impldecl="in implementation">tdeio/previewjob.h</include> <include location="global" impldecl="in implementation">klistbox.h</include> </includes> <Q_SLOTS> diff --git a/kipi-plugins/mpegencoder/optionsdialog.cpp b/kipi-plugins/mpegencoder/optionsdialog.cpp index d657a86..b0fa30c 100644 --- a/kipi-plugins/mpegencoder/optionsdialog.cpp +++ b/kipi-plugins/mpegencoder/optionsdialog.cpp @@ -35,7 +35,7 @@ #include <klocale.h> #include <klineedit.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> // Local includes. diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp index cd562b5..fe8732b 100644 --- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp +++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp @@ -33,7 +33,7 @@ #include <kapplication.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> |