diff options
Diffstat (limited to 'umbrello')
29 files changed, 37 insertions, 37 deletions
diff --git a/umbrello/umbrello/CMakeLists.txt b/umbrello/umbrello/CMakeLists.txt index 7329dec6..5080dcc2 100644 --- a/umbrello/umbrello/CMakeLists.txt +++ b/umbrello/umbrello/CMakeLists.txt @@ -77,7 +77,7 @@ tde_add_executable( umbrello AUTOMOC umlviewimageexporter.cpp umlviewimageexporterall.cpp umlviewimageexportermodel.cpp umlwidget.cpp umlwidgetcontroller.cpp uniqueid.cpp usecase.cpp usecasewidget.cpp widgetbase.cpp - widget_factory.cpp widget_utils.cpp worktoolbar.cpp + widget_factory.cpp widget_utils.cpp wortdetoolbar.cpp LINK refactoring-static codeimport-static kdevcppparser-static clipboard-static codegenerator-static docgenerators-static dialogs-static diff --git a/umbrello/umbrello/Makefile.am b/umbrello/umbrello/Makefile.am index b19ecb18..25d90fe9 100644 --- a/umbrello/umbrello/Makefile.am +++ b/umbrello/umbrello/Makefile.am @@ -111,7 +111,7 @@ usecasewidget.cpp \ widgetbase.cpp \ widget_factory.cpp \ widget_utils.cpp \ -worktoolbar.cpp +wortdetoolbar.cpp #umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_TDEPRINT) $(LIB_KIO) umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la ./docgenerators/libdocgenerators.la $(LIB_TDEPRINT) $(LIB_KIO) diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h index f34b7df9..68b1384e 100644 --- a/umbrello/umbrello/activitywidget.h +++ b/umbrello/umbrello/activitywidget.h @@ -13,7 +13,7 @@ #define ACTIVITYWIDGET_H #include "umlwidget.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" #define ACTIVITY_MARGIN 5 #define ACTIVITY_WIDTH 30 diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h index 581a023c..a68cf60b 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -13,7 +13,7 @@ #define ALIGNTOOLBAR_H #include <tqpixmap.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include "umlnamespace.h" #include "umlwidgetlist.h" diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h index 27b49b40..26b42039 100644 --- a/umbrello/umbrello/dialogs/activitydialog.h +++ b/umbrello/umbrello/dialogs/activitydialog.h @@ -20,7 +20,7 @@ //kde class includes #include <kdialogbase.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> //local class includes #include "umlwidgetcolorpage.h" diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h index 7f20c427..4bd892f4 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.h +++ b/umbrello/umbrello/dialogs/assocpropdlg.h @@ -14,7 +14,7 @@ //kde class includes #include <kdialogbase.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include "../associationwidget.h" class AssocRolePage; diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h index d11e0d25..3eeafe2b 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.h +++ b/umbrello/umbrello/dialogs/classpropdlg.h @@ -14,7 +14,7 @@ //kde class includes #include <kdialogbase.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include "../umlnamespace.h" diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 4de2f313..f4e107f3 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -342,7 +342,7 @@ <customwidgets> <customwidget> <class>TDEFontChooser</class> - <header location="global">kfontdialog.h</header> + <header location="global">tdefontdialog.h</header> <sizehint> <width>-1</width> <height>-1</height> diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp index f4715b0d..f0657e96 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp @@ -22,7 +22,7 @@ // qt/kde includes #include <kdebug.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kcolorbutton.h> diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h index 98fb4549..5b47bd9b 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.h +++ b/umbrello/umbrello/dialogs/settingsdlg.h @@ -22,7 +22,7 @@ #include <tqdict.h> //kde includes #include <kcombobox.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kdialogbase.h> #include <kcolorbutton.h> #include <knuminput.h> diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp index e49d1633..da3c28d1 100644 --- a/umbrello/umbrello/dialogs/statedialog.cpp +++ b/umbrello/umbrello/dialogs/statedialog.cpp @@ -22,7 +22,7 @@ //kde includes #include <kiconloader.h> #include <klocale.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> //local includes #include "../umlview.h" diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 804100c4..91586098 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -24,7 +24,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kmessagebox.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kdebug.h> #include <knuminput.h> diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 791c8ad8..1f87e732 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -18,8 +18,8 @@ */ #include <kapplication.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> #include <tqtooltip.h> #include <tqwhatsthis.h> diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index 665cc621..08c5a3ed 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -16,7 +16,7 @@ #ifndef KPLAYERSLIDERACTION_H #define KPLAYERSLIDERACTION_H -#include <kaction.h> +#include <tdeaction.h> #include <tqslider.h> /**KPlayer's slider widget. Works around the TQt upside-down slider bug. diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h index 1b61ab08..0ceddb50 100644 --- a/umbrello/umbrello/listpopupmenu.h +++ b/umbrello/umbrello/listpopupmenu.h @@ -12,7 +12,7 @@ #ifndef LISTPOPUPMENU_H #define LISTPOPUPMENU_H -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "umlnamespace.h" class UMLView; diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h index f14f7571..ab68b140 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.h +++ b/umbrello/umbrello/refactoring/refactoringassistant.h @@ -15,7 +15,7 @@ #define REFACTORING_ASSISTANT -#include <klistview.h> +#include <tdelistview.h> #include <tqpixmap.h> #include <map> diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h index f4a8008a..5aec4396 100644 --- a/umbrello/umbrello/statewidget.h +++ b/umbrello/umbrello/statewidget.h @@ -14,7 +14,7 @@ #include <tqpainter.h> #include <tqstringlist.h> #include "umlwidget.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" #define STATE_MARGIN 5 #define STATE_WIDTH 30 diff --git a/umbrello/umbrello/textbloctdelist.h b/umbrello/umbrello/textblocklist.h index bb1b7416..bb1b7416 100644 --- a/umbrello/umbrello/textbloctdelist.h +++ b/umbrello/umbrello/textblocklist.h diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h index 89597211..43938573 100644 --- a/umbrello/umbrello/toolbarstatearrow.h +++ b/umbrello/umbrello/toolbarstatearrow.h @@ -15,7 +15,7 @@ #include "toolbarstate.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" class TQMouseEvent; class UMLView; diff --git a/umbrello/umbrello/toolbarstatefactory.h b/umbrello/umbrello/toolbarstatefactory.h index b5c1ee4c..2f7eb058 100644 --- a/umbrello/umbrello/toolbarstatefactory.h +++ b/umbrello/umbrello/toolbarstatefactory.h @@ -14,7 +14,7 @@ #include "toolbarstate.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" #define NR_OF_TOOLBAR_STATES 4 diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h index 9989d98e..d7629a49 100644 --- a/umbrello/umbrello/toolbarstatepool.h +++ b/umbrello/umbrello/toolbarstatepool.h @@ -14,7 +14,7 @@ #include "toolbarstate.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" /** * Base class for tools that can use the same state but with different button. 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 diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h index c9463a53..f3cbb2e8 100644 --- a/umbrello/umbrello/umldoc.h +++ b/umbrello/umbrello/umldoc.h @@ -28,7 +28,7 @@ // kde includes #include <kurl.h> #include <kdockwidget.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> // app includes #include "umlnamespace.h" diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h index 9b64ae3d..2bbc7ffc 100644 --- a/umbrello/umbrello/umllistview.h +++ b/umbrello/umbrello/umllistview.h @@ -14,7 +14,7 @@ #include <tqdom.h> #include <tqpixmap.h> -#include <klistview.h> +#include <tdelistview.h> #include "umlnamespace.h" #include "umllistviewitemlist.h" diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h index 805c28af..856f4e49 100644 --- a/umbrello/umbrello/umlview.h +++ b/umbrello/umbrello/umlview.h @@ -27,7 +27,7 @@ #include "associationwidgetlist.h" #include "messagewidgetlist.h" #include "optionstate.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" // forward declarations class ClassOptionsPage; diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index e5a2519d..a51a5ae1 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -16,7 +16,7 @@ #include <tqcolor.h> #include <kdebug.h> #include <kcolordialog.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kmessagebox.h> // local includes #include "umlwidgetcontroller.h" diff --git a/umbrello/umbrello/wortdetoolbar.cpp b/umbrello/umbrello/wortdetoolbar.cpp index 80d9c810..03fe2b18 100644 --- a/umbrello/umbrello/wortdetoolbar.cpp +++ b/umbrello/umbrello/wortdetoolbar.cpp @@ -10,20 +10,20 @@ ***************************************************************************/ // own header -#include "worktoolbar.h" +#include "wortdetoolbar.h" // qt/kde include files #include <tqmainwindow.h> #include <kdebug.h> #include <klocale.h> #include <kstandarddirs.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> // application specific includes #include "uml.h" #include "umldoc.h" #include "umlview.h" -#include "worktoolbar.h" +#include "wortdetoolbar.h" WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) @@ -312,4 +312,4 @@ void WorkToolBar::loadPixmaps() { } } -#include "worktoolbar.moc" +#include "wortdetoolbar.moc" diff --git a/umbrello/umbrello/wortdetoolbar.h b/umbrello/umbrello/wortdetoolbar.h index a7d9339c..f3b2b815 100644 --- a/umbrello/umbrello/wortdetoolbar.h +++ b/umbrello/umbrello/wortdetoolbar.h @@ -15,7 +15,7 @@ #include <tqmap.h> #include <tqpixmap.h> #include <tqcursor.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include "umlnamespace.h" diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj index 6f584c8d..aeba8483 100644 --- a/umbrello/uml.kdevprj +++ b/umbrello/uml.kdevprj @@ -437,7 +437,7 @@ install_location= type=DATA [uml/Makefile.am] -files=uml/actor.h,uml/actorwidgetdata.h,uml/actorwidget.h,uml/associationwidgetdata.h,uml/associationwidgetdatalist.h,uml/associationwidget.h,uml/assocrules.h,uml/attribute.h,uml/concept.h,uml/conceptwidgetdata.h,uml/conceptwidget.h,uml/docwindow.h,uml/floatingtextdata.h,uml/floatingtext.h,uml/infowidget.h,uml/kstartuplogo.h,uml/linepath.h,uml/listpopupmenu.h,uml/messagewidgetdata.h,uml/messagewidget.h,uml/actor.cpp,uml/actorwidget.cpp,uml/actorwidgetdata.cpp,uml/associationwidget.cpp,uml/associationwidgetdata.cpp,uml/assocrules.cpp,uml/attribute.cpp,uml/concept.cpp,uml/conceptwidget.cpp,uml/conceptwidgetdata.cpp,uml/docwindow.cpp,uml/floatingtext.cpp,uml/floatingtextdata.cpp,uml/infowidget.cpp,uml/kstartuplogo.cpp,uml/linepath.cpp,uml/listpopupmenu.cpp,uml/main.cpp,uml/messagewidget.cpp,uml/messagewidgetdata.cpp,uml/notewidget.cpp,uml/notewidgetdata.cpp,uml/notewidgetdata.h,uml/notewidget.h,uml/objectwidget.cpp,uml/objectwidgetdata.cpp,uml/objectwidgetdata.h,uml/objectwidget.h,uml/operation.cpp,uml/operation.h,uml/statewidget.cpp,uml/statewidgetdata.cpp,uml/statewidgetdata.h,uml/statewidget.h,uml/uml.cpp,uml/umldoc.cpp,uml/umldoc.h,uml/uml.h,uml/umlnamespace.cpp,uml/umlnamespace.h,uml/umlobject.cpp,uml/umlobject.h,uml/umlobjectlist.h,uml/umlviewcanvas.cpp,uml/umlviewcanvas.h,uml/umlview.cpp,uml/umlviewdata.cpp,uml/umlviewdata.h,uml/umlview.h,uml/umlviewlist.h,uml/umlwidget.cpp,uml/umlwidgetdata.cpp,uml/umlwidgetdata.h,uml/umlwidget.h,uml/umlwidgetlist.h,uml/usecase.cpp,uml/usecase.h,uml/usecasewidget.cpp,uml/usecasewidgetdata.cpp,uml/usecasewidgetdata.h,uml/usecasewidget.h,uml/worktoolbar.cpp,uml/worktoolbar.h,uml/hi16-app-uml.png,uml/hi32-app-uml.png,uml/lo16-app-uml.png,uml/lo32-app-uml.png,uml/tips,uml/uml.desktop,uml/umlui.rc,uml/x-uml.desktop,uml/activitywidgetdata.cpp,uml/activitywidgetdata.h,uml/activitywidget.cpp,uml/activitywidget.h,uml/codegenerator.cpp,uml/codegenerator.h,uml/seqlinewidget.cpp,uml/seqlinewidget.h,uml/umllistview.cpp,uml/umllistview.h,uml/umllistviewitem.cpp,uml/umllistviewitem.h,uml/umllistviewitemdata.cpp,uml/umllistviewitemdata.h,uml/umllistviewitemdatalist.h,uml/classimport.cpp,uml/classimport.h,uml/umllistviewitemlist.h +files=uml/actor.h,uml/actorwidgetdata.h,uml/actorwidget.h,uml/associationwidgetdata.h,uml/associationwidgetdatalist.h,uml/associationwidget.h,uml/assocrules.h,uml/attribute.h,uml/concept.h,uml/conceptwidgetdata.h,uml/conceptwidget.h,uml/docwindow.h,uml/floatingtextdata.h,uml/floatingtext.h,uml/infowidget.h,uml/kstartuplogo.h,uml/linepath.h,uml/listpopupmenu.h,uml/messagewidgetdata.h,uml/messagewidget.h,uml/actor.cpp,uml/actorwidget.cpp,uml/actorwidgetdata.cpp,uml/associationwidget.cpp,uml/associationwidgetdata.cpp,uml/assocrules.cpp,uml/attribute.cpp,uml/concept.cpp,uml/conceptwidget.cpp,uml/conceptwidgetdata.cpp,uml/docwindow.cpp,uml/floatingtext.cpp,uml/floatingtextdata.cpp,uml/infowidget.cpp,uml/kstartuplogo.cpp,uml/linepath.cpp,uml/listpopupmenu.cpp,uml/main.cpp,uml/messagewidget.cpp,uml/messagewidgetdata.cpp,uml/notewidget.cpp,uml/notewidgetdata.cpp,uml/notewidgetdata.h,uml/notewidget.h,uml/objectwidget.cpp,uml/objectwidgetdata.cpp,uml/objectwidgetdata.h,uml/objectwidget.h,uml/operation.cpp,uml/operation.h,uml/statewidget.cpp,uml/statewidgetdata.cpp,uml/statewidgetdata.h,uml/statewidget.h,uml/uml.cpp,uml/umldoc.cpp,uml/umldoc.h,uml/uml.h,uml/umlnamespace.cpp,uml/umlnamespace.h,uml/umlobject.cpp,uml/umlobject.h,uml/umlobjectlist.h,uml/umlviewcanvas.cpp,uml/umlviewcanvas.h,uml/umlview.cpp,uml/umlviewdata.cpp,uml/umlviewdata.h,uml/umlview.h,uml/umlviewlist.h,uml/umlwidget.cpp,uml/umlwidgetdata.cpp,uml/umlwidgetdata.h,uml/umlwidget.h,uml/umlwidgetlist.h,uml/usecase.cpp,uml/usecase.h,uml/usecasewidget.cpp,uml/usecasewidgetdata.cpp,uml/usecasewidgetdata.h,uml/usecasewidget.h,uml/wortdetoolbar.cpp,uml/wortdetoolbar.h,uml/hi16-app-uml.png,uml/hi32-app-uml.png,uml/lo16-app-uml.png,uml/lo32-app-uml.png,uml/tips,uml/uml.desktop,uml/umlui.rc,uml/x-uml.desktop,uml/activitywidgetdata.cpp,uml/activitywidgetdata.h,uml/activitywidget.cpp,uml/activitywidget.h,uml/codegenerator.cpp,uml/codegenerator.h,uml/seqlinewidget.cpp,uml/seqlinewidget.h,uml/umllistview.cpp,uml/umllistview.h,uml/umllistviewitem.cpp,uml/umllistviewitem.h,uml/umllistviewitemdata.cpp,uml/umllistviewitemdata.h,uml/umllistviewitemdatalist.h,uml/classimport.cpp,uml/classimport.h,uml/umllistviewitemlist.h sub_dirs=classparser,clipboard,dialogs,pics,codegenerators,headings type=prog_main @@ -2135,13 +2135,13 @@ install=false install_location= type=HEADER -[uml/worktoolbar.cpp] +[uml/wortdetoolbar.cpp] dist=true install=false install_location= type=SOURCE -[uml/worktoolbar.h] +[uml/wortdetoolbar.h] dist=true install=false install_location= |