From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: 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 --- kxkb/kxkbtraywindow.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'kxkb/kxkbtraywindow.cpp') diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 749ef4353..38cc57231 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -48,23 +48,23 @@ void KxkbLabelController::setPixmap(const TQPixmap& pixmap) } -void KxkbLabelController::setCurrentLayout(const LayoutUnit& layoutUnit) +void KxkbLabelController::setCurrentLayout(const LayoutUnit& tqlayoutUnit) { - setToolTip(m_descriptionMap[layoutUnit.toPair()]); - setPixmap( LayoutIcon::getInstance().findPixmap(layoutUnit.layout, m_showFlag, layoutUnit.displayName) ); + setToolTip(m_descriptionMap[tqlayoutUnit.toPair()]); + setPixmap( LayoutIcon::getInstance().findPixmap(tqlayoutUnit.tqlayout, m_showFlag, tqlayoutUnit.displayName) ); } -void KxkbLabelController::setError(const TQString& layoutInfo) +void KxkbLabelController::setError(const TQString& tqlayoutInfo) { - TQString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo); + TQString msg = i18n("Error changing keyboard tqlayout to '%1'").arg(tqlayoutInfo); setToolTip(msg); label->setPixmap(LayoutIcon::getInstance().findPixmap("error", m_showFlag)); } -void KxkbLabelController::initLayoutList(const TQValueList& layouts, const XkbRules& rules) +void KxkbLabelController::initLayoutList(const TQValueList& tqlayouts, const XkbRules& rules) { // KPopupMenu* menu = contextMenu(); TQPopupMenu* menu = contextMenu; @@ -85,15 +85,15 @@ void KxkbLabelController::initLayoutList(const TQValueList& layouts, int cnt = 0; TQValueList::ConstIterator it; - for (it=layouts.begin(); it != layouts.end(); ++it) + for (it=tqlayouts.begin(); it != tqlayouts.end(); ++it) { - const TQString layoutName = (*it).layout; + const TQString tqlayoutName = (*it).tqlayout; const TQString variantName = (*it).variant; - const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, m_showFlag, (*it).displayName); - const TQPixmap pix = iconeffect.apply(layoutPixmap, KIcon::Small, KIcon::DefaultState); + const TQPixmap& tqlayoutPixmap = LayoutIcon::getInstance().findPixmap(tqlayoutName, m_showFlag, (*it).displayName); + const TQPixmap pix = iconeffect.apply(tqlayoutPixmap, KIcon::Small, KIcon::DefaultState); - TQString fullName = i18n((rules.layouts()[layoutName])); + TQString fullName = i18n((rules.tqlayouts()[tqlayoutName])); if( variantName.isEmpty() == false ) fullName += " (" + variantName + ")"; contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt, m_menuStartIndex + cnt); -- cgit v1.2.3