diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
commit | 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch) | |
tree | daabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kxkb/kxkb.h | |
parent | 50001f1757f97510e80cb1990e2f2d5b00144c2a (diff) | |
download | tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kxkb/kxkb.h')
-rw-r--r-- | kxkb/kxkb.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index fc05c620a..fafb26eb3 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -44,7 +44,7 @@ class KWinModule; class LayoutMap; /* This is the main Kxkb class responsible for reading options - and switching layouts + and switching tqlayouts */ class KXKBApp : public KUniqueApplication @@ -58,9 +58,9 @@ public: virtual int newInstance(); - bool setLayout(const LayoutUnit& layoutUnit, int group=-1); + bool setLayout(const LayoutUnit& tqlayoutUnit, int group=-1); k_dcop: - bool setLayout(const TQString& layoutPair); + bool setLayout(const TQString& tqlayoutPair); TQString getCurrentLayout() { return m_currentLayout.toPair(); } TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); } void forceSetXKBMap( bool set ); @@ -75,7 +75,7 @@ protected slots: protected: // Read settings, and apply them. bool settingsRead(); - void layoutApply(); + void tqlayoutApply(); private: void initTray(); @@ -84,7 +84,7 @@ private: KxkbConfig kxkbConfig; WId m_prevWinId; // for tricky part of saving xkb group - LayoutMap* m_layoutOwnerMap; + LayoutMap* m_tqlayoutOwnerMap; LayoutUnit m_currentLayout; |