diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /umbrello/umbrello/dialogs | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'umbrello/umbrello/dialogs')
| -rw-r--r-- | umbrello/umbrello/dialogs/codegenerationoptionspage.cpp | 2 | ||||
| -rw-r--r-- | umbrello/umbrello/dialogs/exportallviewsdialog.cpp | 2 | ||||
| -rw-r--r-- | umbrello/umbrello/dialogs/settingsdlg.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index a5ce2f57..d8e94856 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -29,7 +29,7 @@ //kde include #include <knuminput.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> //qt include diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp index 7560b850..12836f0b 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp @@ -18,7 +18,7 @@ #include <tqtooltip.h> // kde include files -#include <kfilefiltercombo.h> +#include <tdefilefiltercombo.h> #include <klocale.h> // application specific includes diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 172c695f..145b0519 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> // app includes #include "codegenerationoptionspage.h" #include "codevieweroptionspage.h" |