diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:07 -0600 |
| commit | e46eba349e7029d919b213b7130086503d1e042e (patch) | |
| tree | c99ad6970d22aa80d905a7129d87aa627ae26801 /umbrello/umbrello/uml.cpp | |
| parent | df726f3e9706e8264827dc1dc8338225c3b6434f (diff) | |
| download | tdesdk-e46eba349e7029d919b213b7130086503d1e042e.tar.gz tdesdk-e46eba349e7029d919b213b7130086503d1e042e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'umbrello/umbrello/uml.cpp')
| -rw-r--r-- | umbrello/umbrello/uml.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 23b87597..1cc01c01 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> // kde includes -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdeconfig.h> #include <kcursor.h> @@ -37,8 +37,8 @@ #include <kstatusbar.h> #include <ktip.h> #include <ktabwidget.h> -#include <ktoolbarbutton.h> -#include <kpopupmenu.h> +#include <tdetoolbarbutton.h> +#include <tdepopupmenu.h> // app includes #include "aligntoolbar.h" @@ -53,7 +53,7 @@ #include "umldoc.h" #include "umllistview.h" #include "umlviewlist.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" #ifdef HAVE_DOT # include "autotqlayout/autolayoutdlg.h" //dimitri #endif |