From bbee81eada098581ea3b27d24c0b1d39b32751f6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:05:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- src/kvilib/tal/kvi_tal_mainwindow.cpp | 2 +- src/kvilib/tal/kvi_tal_mainwindow_kde.h | 2 +- src/kvilib/tal/kvi_tal_toolbar.cpp | 2 +- src/kvilib/tal/kvi_tal_toolbar_kde.h | 2 +- src/modules/dockwidget/libkvidockwidget_qt3.cpp | 2 +- src/modules/dockwidget/libkvidockwidget_qt3.h | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kvilib/tal/kvi_tal_mainwindow.cpp b/src/kvilib/tal/kvi_tal_mainwindow.cpp index cf481ec6..0a83e90e 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow.cpp +++ b/src/kvilib/tal/kvi_tal_mainwindow.cpp @@ -28,7 +28,7 @@ #ifdef COMPILE_TDE_SUPPORT KviTalMainWindow::KviTalMainWindow(TQWidget * par,const char * nam) - : KMainWindow(par,nam) + : TDEMainWindow(par,nam) { } diff --git a/src/kvilib/tal/kvi_tal_mainwindow_kde.h b/src/kvilib/tal/kvi_tal_mainwindow_kde.h index 6f704b47..32250c31 100644 --- a/src/kvilib/tal/kvi_tal_mainwindow_kde.h +++ b/src/kvilib/tal/kvi_tal_mainwindow_kde.h @@ -25,7 +25,7 @@ #include -class KVILIB_API KviTalMainWindow : public KMainWindow +class KVILIB_API KviTalMainWindow : public TDEMainWindow { Q_OBJECT diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp index 8f80a1be..393b15d6 100644 --- a/src/kvilib/tal/kvi_tal_toolbar.cpp +++ b/src/kvilib/tal/kvi_tal_toolbar.cpp @@ -28,7 +28,7 @@ #ifdef COMPILE_TDE_SUPPORT KviTalToolBar::KviTalToolBar(const TQString &label,TQMainWindow *w,TQT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam) - : KToolBar(w,dock,bNewLine,nam) + : TDEToolBar(w,dock,bNewLine,nam) { setLabel(label); } diff --git a/src/kvilib/tal/kvi_tal_toolbar_kde.h b/src/kvilib/tal/kvi_tal_toolbar_kde.h index c22cb3c1..6310edb9 100644 --- a/src/kvilib/tal/kvi_tal_toolbar_kde.h +++ b/src/kvilib/tal/kvi_tal_toolbar_kde.h @@ -26,7 +26,7 @@ #include "kvi_tal_toolbardocktype.h" -class KVILIB_API KviTalToolBar : public KToolBar +class KVILIB_API KviTalToolBar : public TDEToolBar { Q_OBJECT diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index d4ab5ee6..fee1cf23 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -141,7 +141,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) m_pAwayPopup = new KviTalPopupMenu(this); #ifdef COMPILE_TDE_SUPPORT - m_pContextPopup = new KPopupMenu(this); + m_pContextPopup = new TDEPopupMenu(this); m_pContextPopup->insertTitle(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("KVIrc")); #else m_pContextPopup = new KviTalPopupMenu(this); diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.h b/src/modules/dockwidget/libkvidockwidget_qt3.h index 5003057f..53a5f6fd 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.h +++ b/src/modules/dockwidget/libkvidockwidget_qt3.h @@ -24,7 +24,7 @@ #include "kvi_frame.h" #ifdef COMPILE_TDE_SUPPORT - class KPopupMenu; + class TDEPopupMenu; #else class KviTalPopupMenu; #endif @@ -49,7 +49,7 @@ protected: KviFrame * m_pFrm; KviDynamicToolTip * m_pTip; #ifdef COMPILE_TDE_SUPPORT - KPopupMenu * m_pContextPopup; + TDEPopupMenu * m_pContextPopup; #else KviTalPopupMenu * m_pContextPopup; #endif -- cgit v1.2.1