summaryrefslogtreecommitdiffstats
path: root/umbrello
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-26 17:52:52 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-26 17:52:52 +0100
commit94258a77f48a82bb083c1d4c20003a7936a333c8 (patch)
tree36cd035f22448f9615b5e0e2755fe7998eb6f1b3 /umbrello
parentd2b21b40f7d4c2a2036160f205cde64b2a8bb242 (diff)
downloadtdesdk-94258a77f48a82bb083c1d4c20003a7936a333c8.tar.gz
tdesdk-94258a77f48a82bb083c1d4c20003a7936a333c8.zip
Fix unintended rename of worktoolbar
Diffstat (limited to 'umbrello')
-rw-r--r--umbrello/umbrello/CMakeLists.txt2
-rw-r--r--umbrello/umbrello/Makefile.am2
-rw-r--r--umbrello/umbrello/activitywidget.h2
-rw-r--r--umbrello/umbrello/statewidget.h2
-rw-r--r--umbrello/umbrello/toolbarstatearrow.h2
-rw-r--r--umbrello/umbrello/toolbarstatefactory.h2
-rw-r--r--umbrello/umbrello/toolbarstatepool.h2
-rw-r--r--umbrello/umbrello/uml.cpp2
-rw-r--r--umbrello/umbrello/umlview.h2
-rw-r--r--umbrello/umbrello/worktoolbar.cpp (renamed from umbrello/umbrello/wortdetoolbar.cpp)6
-rw-r--r--umbrello/umbrello/worktoolbar.h (renamed from umbrello/umbrello/wortdetoolbar.h)0
-rw-r--r--umbrello/uml.kdevprj6
12 files changed, 15 insertions, 15 deletions
diff --git a/umbrello/umbrello/CMakeLists.txt b/umbrello/umbrello/CMakeLists.txt
index 5080dcc2..7329dec6 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 wortdetoolbar.cpp
+ widget_factory.cpp widget_utils.cpp worktoolbar.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 25d90fe9..b19ecb18 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 \
-wortdetoolbar.cpp
+worktoolbar.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 68b1384e..f34b7df9 100644
--- a/umbrello/umbrello/activitywidget.h
+++ b/umbrello/umbrello/activitywidget.h
@@ -13,7 +13,7 @@
#define ACTIVITYWIDGET_H
#include "umlwidget.h"
-#include "wortdetoolbar.h"
+#include "worktoolbar.h"
#define ACTIVITY_MARGIN 5
#define ACTIVITY_WIDTH 30
diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h
index 5aec4396..f4a8008a 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 "wortdetoolbar.h"
+#include "worktoolbar.h"
#define STATE_MARGIN 5
#define STATE_WIDTH 30
diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h
index 43938573..89597211 100644
--- a/umbrello/umbrello/toolbarstatearrow.h
+++ b/umbrello/umbrello/toolbarstatearrow.h
@@ -15,7 +15,7 @@
#include "toolbarstate.h"
-#include "wortdetoolbar.h"
+#include "worktoolbar.h"
class TQMouseEvent;
class UMLView;
diff --git a/umbrello/umbrello/toolbarstatefactory.h b/umbrello/umbrello/toolbarstatefactory.h
index 2f7eb058..b5c1ee4c 100644
--- a/umbrello/umbrello/toolbarstatefactory.h
+++ b/umbrello/umbrello/toolbarstatefactory.h
@@ -14,7 +14,7 @@
#include "toolbarstate.h"
-#include "wortdetoolbar.h"
+#include "worktoolbar.h"
#define NR_OF_TOOLBAR_STATES 4
diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h
index d7629a49..9989d98e 100644
--- a/umbrello/umbrello/toolbarstatepool.h
+++ b/umbrello/umbrello/toolbarstatepool.h
@@ -14,7 +14,7 @@
#include "toolbarstate.h"
-#include "wortdetoolbar.h"
+#include "worktoolbar.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 a472cbff..7b491208 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -53,7 +53,7 @@
#include "umldoc.h"
#include "umllistview.h"
#include "umlviewlist.h"
-#include "wortdetoolbar.h"
+#include "worktoolbar.h"
#ifdef HAVE_DOT
# include "autotqlayout/autolayoutdlg.h" //dimitri
#endif
diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h
index 856f4e49..805c28af 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 "wortdetoolbar.h"
+#include "worktoolbar.h"
// forward declarations
class ClassOptionsPage;
diff --git a/umbrello/umbrello/wortdetoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp
index c3aa3be4..f1af2dbd 100644
--- a/umbrello/umbrello/wortdetoolbar.cpp
+++ b/umbrello/umbrello/worktoolbar.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
// own header
-#include "wortdetoolbar.h"
+#include "worktoolbar.h"
// qt/kde include files
#include <tqmainwindow.h>
@@ -23,7 +23,7 @@
#include "uml.h"
#include "umldoc.h"
#include "umlview.h"
-#include "wortdetoolbar.h"
+#include "worktoolbar.h"
WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name)
@@ -312,4 +312,4 @@ void WorkToolBar::loadPixmaps() {
}
}
-#include "wortdetoolbar.moc"
+#include "worktoolbar.moc"
diff --git a/umbrello/umbrello/wortdetoolbar.h b/umbrello/umbrello/worktoolbar.h
index f3b2b815..f3b2b815 100644
--- a/umbrello/umbrello/wortdetoolbar.h
+++ b/umbrello/umbrello/worktoolbar.h
diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj
index aeba8483..6f584c8d 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/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
+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
sub_dirs=classparser,clipboard,dialogs,pics,codegenerators,headings
type=prog_main
@@ -2135,13 +2135,13 @@ install=false
install_location=
type=HEADER
-[uml/wortdetoolbar.cpp]
+[uml/worktoolbar.cpp]
dist=true
install=false
install_location=
type=SOURCE
-[uml/wortdetoolbar.h]
+[uml/worktoolbar.h]
dist=true
install=false
install_location=