diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdeui/ktoolbar.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/ktoolbar.cpp')
| -rw-r--r-- | tdeui/ktoolbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp index 32e5b9f14..0fd9e5ada 100644 --- a/tdeui/ktoolbar.cpp +++ b/tdeui/ktoolbar.cpp @@ -255,7 +255,7 @@ void KToolBar::init( bool readConfig, bool honorStyle ) } int KToolBar::insertButton(const TQString& icon, int id, bool enabled, - const TQString& text, int index, KInstance *_instance ) + const TQString& text, int index, TDEInstance *_instance ) { KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance ); @@ -268,7 +268,7 @@ int KToolBar::insertButton(const TQString& icon, int id, bool enabled, int KToolBar::insertButton(const TQString& icon, int id, const char *signal, const TQObject *receiver, const char *slot, - bool enabled, const TQString& text, int index, KInstance *_instance ) + bool enabled, const TQString& text, int index, TDEInstance *_instance ) { KToolBarButton *button = new KToolBarButton( icon, id, this, 0, text, _instance); insertWidgetInternal( button, index, id ); |