diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:14:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:14:24 -0600 |
| commit | 33be37a9fd375a72b3b08220c5a36860f4195864 (patch) | |
| tree | 739973e1882267cbe29644b669a0163a1092b1db /kipi-plugins/flickrexport | |
| parent | 14b1eb042ec8a3f40a9f00a48c702ebfcd77d92b (diff) | |
| download | kipi-plugins-33be37a9fd375a72b3b08220c5a36860f4195864.tar.gz kipi-plugins-33be37a9fd375a72b3b08220c5a36860f4195864.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/flickrexport')
| -rw-r--r-- | kipi-plugins/flickrexport/flickrwidget.cpp | 4 | ||||
| -rw-r--r-- | kipi-plugins/flickrexport/flickrwindow.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kipi-plugins/flickrexport/flickrwidget.cpp b/kipi-plugins/flickrexport/flickrwidget.cpp index 6f143da..7c7525c 100644 --- a/kipi-plugins/flickrexport/flickrwidget.cpp +++ b/kipi-plugins/flickrexport/flickrwidget.cpp @@ -43,8 +43,8 @@ #include <kdialog.h> #include <kactivelabel.h> #include <klocale.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <kseparator.h> #include <kiconloader.h> #include <kapplication.h> diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp index 61e0d27..8741b77 100644 --- a/kipi-plugins/flickrexport/flickrwindow.cpp +++ b/kipi-plugins/flickrexport/flickrwindow.cpp @@ -42,15 +42,15 @@ #include <kmessagebox.h> #include <kapplication.h> #include <kiconloader.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <ktabwidget.h> #include <krun.h> #include <kdebug.h> #include <kconfig.h> #include <tdeversion.h> #if KDE_IS_VERSION(3,2,0) -#include <kwallet.h> +#include <tdewallet.h> #endif // Libkipi includes. |