From f537c21b68e08f649b1b297bce8f3904603137e0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:11:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kxkb/kxkb.cpp | 2 +- kxkb/kxkbtraywindow.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kxkb') diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 4e5ad5192..47fabcdfa 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -192,7 +192,7 @@ void KXKBApp::initTray() if( !m_tray ) { KSystemTray* sysTray = new KxkbSystemTray(); - KPopupMenu* popupMenu = sysTray->contextMenu(); + TDEPopupMenu* popupMenu = sysTray->contextMenu(); // popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() ); m_tray = new KxkbLabelController(sysTray, popupMenu); diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 749ef4353..6f899eadd 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -66,7 +66,7 @@ void KxkbLabelController::setError(const TQString& layoutInfo) void KxkbLabelController::initLayoutList(const TQValueList& layouts, const XkbRules& rules) { -// KPopupMenu* menu = contextMenu(); +// TDEPopupMenu* menu = contextMenu(); TQPopupMenu* menu = contextMenu; // int index = menu->indexOf(0); @@ -114,7 +114,7 @@ void KxkbLabelController::initLayoutList(const TQValueList& layouts, /* if( index != -1 ) { //not first start menu->insertSeparator(); - KAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection()); + TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection()); if (quitAction) quitAction->plug(menu); }*/ -- cgit v1.2.1