Fix unintended rename of worktoolbar

pull/1/head
Slávek Banko 12 years ago
parent d2b21b40f7
commit 94258a77f4

@ -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

@ -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)

@ -13,7 +13,7 @@
#define ACTIVITYWIDGET_H
#include "umlwidget.h"
#include "wortdetoolbar.h"
#include "worktoolbar.h"
#define ACTIVITY_MARGIN 5
#define ACTIVITY_WIDTH 30

@ -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

@ -15,7 +15,7 @@
#include "toolbarstate.h"
#include "wortdetoolbar.h"
#include "worktoolbar.h"
class TQMouseEvent;
class UMLView;

@ -14,7 +14,7 @@
#include "toolbarstate.h"
#include "wortdetoolbar.h"
#include "worktoolbar.h"
#define NR_OF_TOOLBAR_STATES 4

@ -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.

@ -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

@ -27,7 +27,7 @@
#include "associationwidgetlist.h"
#include "messagewidgetlist.h"
#include "optionstate.h"
#include "wortdetoolbar.h"
#include "worktoolbar.h"
// forward declarations
class ClassOptionsPage;

@ -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"

@ -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=

Loading…
Cancel
Save