diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:17:08 -0600 |
| commit | a8c829b452a5468bbfa097a4d589e41f777a817e (patch) | |
| tree | ecc783140fe95562ea61cb20220af273e692e469 /kipi-plugins/galleryexport | |
| parent | 73e359253bdf561c5740a3ec820c18ea4d346466 (diff) | |
| download | kipi-plugins-a8c829b452a5468bbfa097a4d589e41f777a817e.tar.gz kipi-plugins-a8c829b452a5468bbfa097a4d589e41f777a817e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/galleryexport')
| -rw-r--r-- | kipi-plugins/galleryexport/gallerywindow.cpp | 2 | ||||
| -rw-r--r-- | kipi-plugins/galleryexport/plugin_galleryexport.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp index 097d9df..be5087f 100644 --- a/kipi-plugins/galleryexport/gallerywindow.cpp +++ b/kipi-plugins/galleryexport/gallerywindow.cpp @@ -35,7 +35,7 @@ #include <kaboutdata.h> #include <khelpmenu.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kmessagebox.h> #include <kapplication.h> diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp index d277096..955c2f9 100644 --- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp +++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp @@ -23,7 +23,7 @@ // KDE includes. #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kgenericfactory.h> #include <klibloader.h> #include <tdeconfig.h> |