diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-12 11:34:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-13 10:04:55 +0900 |
| commit | 41f63196dd0642327c581dc22e0c206b35a22cb7 (patch) | |
| tree | 6cdadc0b9a2cbb418848ecb32c289a8c7f7624db /umbrello | |
| parent | 365f31354bad56db26993380120a4d5e26fc133d (diff) | |
| download | tdesdk-41f63196dd0642327c581dc22e0c206b35a22cb7.tar.gz tdesdk-41f63196dd0642327c581dc22e0c206b35a22cb7.zip | |
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8dac8f1a52cf3a2983af451aff69ca268cfbd6d7)
Diffstat (limited to 'umbrello')
| -rw-r--r-- | umbrello/umbrello/codegenerators/rubycodegenerator.cpp | 4 | ||||
| -rw-r--r-- | umbrello/umbrello/codegenerators/rubywriter.cpp | 4 | ||||
| -rw-r--r-- | umbrello/umbrello/umllistview.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp index 05fe6482..0b6eb488 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp @@ -93,9 +93,9 @@ TQString RubyCodeGenerator::cppToRubyType(const TQString &typeStr) { type.replace("const ", ""); type.replace(TQRegExp("[*&\\s]"), ""); type.replace(TQRegExp("[<>]"), "_"); - type.replace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array"); + type.replace("TQStringList", "Array"); type.replace(TQRegExp("^string$"),"String"); - type.replace(TQSTRING_OBJECT_NAME_STRING, "String"); + type.replace("TQString", "String"); type.replace("bool", "true|false"); type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); type.replace(TQRegExp("^(float|double)$"), "Float"); diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp index 9eedaba7..90d55eab 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.cpp +++ b/umbrello/umbrello/codegenerators/rubywriter.cpp @@ -149,8 +149,8 @@ TQString RubyWriter::cppToRubyType(const TQString &typeStr) { type.replace("const ", ""); type.replace(TQRegExp("[*&\\s]"), ""); type.replace(TQRegExp("[<>]"), "_"); - type.replace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array"); - type.replace(TQSTRING_OBJECT_NAME_STRING, "String"); + type.replace("TQStringList", "Array"); + type.replace("TQString", "String"); type.replace("bool", "true|false"); type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); type.replace(TQRegExp("^(float|double)$"), "Float"); diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index 8e0279fe..6069800d 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -142,7 +142,7 @@ UMLListView::UMLListView(TQWidget *parent, const char *name) UMLListView::~UMLListView() {} bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() != TQEvent::MouseButtonPress || !o->isA(TQHEADER_OBJECT_NAME_STRING)) + if (e->type() != TQEvent::MouseButtonPress || !o->isA("TQHeader")) return TQListView::eventFilter(o, e); TQMouseEvent *me = TQT_TQMOUSEEVENT(e); if (me->button() == Qt::RightButton) { |