diff options
author | Timothy Pearson <[email protected]> | 2013-05-23 11:33:34 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-05-23 11:33:34 -0500 |
commit | 2d2661a554c5195069caf2d3eead729f52898a8d (patch) | |
tree | d79d43b5784380fb48be83978d03015cef5c07ef /tdeui/kedittoolbar.h | |
parent | b1c819c3238e94960154915f1ae14131fdb25cf8 (diff) | |
download | tdelibs-2d2661a554c5195069caf2d3eead729f52898a8d.tar.gz tdelibs-2d2661a554c5195069caf2d3eead729f52898a8d.zip |
Fix incomplete size restoration in TDEMainWindow class
This resolves Bug 1519
Clean up build warnings in KEditToolbar
Diffstat (limited to 'tdeui/kedittoolbar.h')
-rw-r--r-- | tdeui/kedittoolbar.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index 829cdd347..99d433db9 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -33,7 +33,7 @@ class TQListViewItem; class KEditToolbarWidget; class KEditToolbarPrivate; class KEditToolbarWidgetPrivate; -namespace +namespace KEditToolbarInternal { class ToolbarItem; class ToolbarListView; @@ -411,9 +411,9 @@ private slots: protected: // KDE4: make private void setupLayout(); - void insertActive(ToolbarItem *item, TQListViewItem *before, bool prepend = false); - void removeActive(ToolbarItem *item); - void moveActive(ToolbarItem *item, TQListViewItem *before); + void insertActive(KEditToolbarInternal::ToolbarItem *item, TQListViewItem *before, bool prepend = false); + void removeActive(KEditToolbarInternal::ToolbarItem *item); + void moveActive(KEditToolbarInternal::ToolbarItem *item, TQListViewItem *before); void initNonKPart(TDEActionCollection *collection, const TQString& file, bool global); void initKPart(KXMLGUIFactory* factory); void loadToolbarCombo(const TQString& defaultToolbar = TQString::null); @@ -421,8 +421,8 @@ protected: // KDE4: make private void updateLocal(TQDomElement& elem); private: - ToolbarListView *m_inactiveList; - ToolbarListView *m_activeList; + KEditToolbarInternal::ToolbarListView *m_inactiveList; + KEditToolbarInternal::ToolbarListView *m_activeList; TQComboBox *m_toolbarCombo; TQToolButton *m_upAction; |