diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-11-02 22:33:43 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-11-05 18:50:24 +0100 |
| commit | aca58384d909cd450bae59a6f46679d8cbb3606a (patch) | |
| tree | 570e5f599175ac15434d0c87a5a4173a3ade0c55 /src/view.cpp | |
| parent | 26de10618a0767658160762b87f1ec2c9c1cbc26 (diff) | |
| download | ktechlab-aca58384d909cd450bae59a6f46679d8cbb3606a.tar.gz ktechlab-aca58384d909cd450bae59a6f46679d8cbb3606a.zip | |
Added controlled conversions to char* instead of automatic ascii conversions.
The definition of -UTQT_NO_ASCII_CAST is no longer needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2c73ccdf45212ab2a43582955be0eff21c70f971)
Diffstat (limited to 'src/view.cpp')
| -rw-r--r-- | src/view.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/view.cpp b/src/view.cpp index 81f88b7..52d2417 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -61,7 +61,7 @@ class KVSSBSep : public TQWidget { //BEGIN class View View::View( Document *document, ViewContainer *viewContainer, uint viewAreaId, const char *name ) - : TQWidget( viewContainer->viewArea(viewAreaId), name ? name : (const char *)("view_" + TQString::number(viewAreaId)) ), + : TQWidget( viewContainer->viewArea(viewAreaId), name ? name : TQString("view_%1").arg(TQString::number(viewAreaId)).latin1() ), KXMLGUIClient() { m_dcopID = 0; @@ -103,7 +103,7 @@ View::~View() TDEAction * View::action( const TQString & name ) const { - TDEAction * action = actionCollection()->action(name); + TDEAction * action = actionCollection()->action(name.utf8()); if ( !action ) kdError() << k_funcinfo << "No such action: " << name << endl; return action; |