1 files changed, 34 insertions, 34 deletions

diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp
index a059e954f..0ca1500e3 100644
--- a/kxkb/pixmap.cpp
+++ b/kxkb/pixmap.cpp
@@ -83,10 +83,10 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis
 		if( pm->height() < FLAG_MAX_HEIGHT ) {
 			TQPixmap* pix = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT);
 			pix->fill( Qt::lightGray );
-//			pix->fill( TQColor(tqRgba(127,127,127,255)) );
-//			TQBitmap tqmask;
-//			tqmask.fill(1);
-//			pix->setMask(tqmask);
+//			pix->fill( TQColor(qRgba(127,127,127,255)) );
+//			TQBitmap mask;
+//			mask.fill(1);
+//			pix->setMask(mask);
 			
 			int dy = (pix->height() - pm->height()) / 2;
 			copyBlt( pix, 0, dy, pm, 0, 0, -1, -1 );
@@ -112,83 +112,83 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis
 }
 
 /**
-@brief Try to get country code from tqlayout name in xkb before xorg 6.9.0
+@brief Try to get country code from layout name in xkb before xorg 6.9.0
 */
-TQString LayoutIcon::getCountryFromLayoutName(const TQString& tqlayoutName)
+TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName)
 {
 	TQString flag;
 	
 	if( X11Helper::areLayoutsClean() ) { // >= Xorg 6.9.0
-		if( tqlayoutName == "mkd" )
+		if( layoutName == "mkd" )
 			flag = "mk";
 		else
-		if( tqlayoutName == "srp" ) {
+		if( layoutName == "srp" ) {
 			TQString csFlagFile = locate("locale", flagTemplate.arg("cs"));
 			flag = csFlagFile.isEmpty() ? "yu" : "cs";
 		}
 		else
-			if( tqlayoutName.endsWith("/jp") )
+			if( layoutName.endsWith("/jp") )
 				flag = "jp";
         else
-            if( tqlayoutName == "trq" || tqlayoutName == "trf" || tqlayoutName == "tralt" )
+            if( layoutName == "trq" || layoutName == "trf" || layoutName == "tralt" )
                 flag = "tr";
 		else
-			if( tqlayoutName.length() > 2 )
+			if( layoutName.length() > 2 )
 				flag = "";
 		else
-				flag = tqlayoutName;
+				flag = layoutName;
 	}
 	else {
-		if( tqlayoutName == "ar" )	// Arabic - not argentina
+		if( layoutName == "ar" )	// Arabic - not argentina
 			;
 		else
-			if( tqlayoutName == "sr" || tqlayoutName == "cs")	// Serbian language - Yugoslavia
+			if( layoutName == "sr" || layoutName == "cs")	// Serbian language - Yugoslavia
 				flag = "yu";
 		else
-			if( tqlayoutName == "bs" )	// Bosnian language - Bosnia
+			if( layoutName == "bs" )	// Bosnian language - Bosnia
 				flag = "ba";
 		else
-			if( tqlayoutName == "la" )	// Latin America
+			if( layoutName == "la" )	// Latin America
 				;
 		else
-			if( tqlayoutName == "lo" )	// Lao
+			if( layoutName == "lo" )	// Lao
 				flag = "la";
 		else
-			if( tqlayoutName == "pl2" )	// Poland
+			if( layoutName == "pl2" )	// Poland
 				flag = "pl";
 		else
-			if( tqlayoutName == "iu" )	// Inuktitut - Canada
+			if( layoutName == "iu" )	// Inuktitut - Canada
 				flag = "ca";
 		else
-			if( tqlayoutName == "syr" )	// Syriac
+			if( layoutName == "syr" )	// Syriac
 				flag = "sy";
 		else
-			if( tqlayoutName == "dz" )	// Dzongka/Tibetian - Buthan
+			if( layoutName == "dz" )	// Dzongka/Tibetian - Buthan
 				flag = "bt";
 		else
-			if( tqlayoutName == "ogham" )	// Ogham - Ireland
+			if( layoutName == "ogham" )	// Ogham - Ireland
 				flag = "ie";
 		else
-			if( tqlayoutName == "ge_la" || tqlayoutName == "ge_ru" )
+			if( layoutName == "ge_la" || layoutName == "ge_ru" )
 				flag = "ge";
 		else
-			if( tqlayoutName == "el" )
+			if( layoutName == "el" )
 				flag = "gr";
 		else
-			if( tqlayoutName.endsWith("/jp") )
+			if( layoutName.endsWith("/jp") )
 				flag = "jp";
 		else
-			if( tqlayoutName == "ml" || tqlayoutName == "dev" || tqlayoutName == "gur" 
-						 || tqlayoutName == "guj" || tqlayoutName == "kan" || tqlayoutName == "ori" 
-						 || tqlayoutName == "tel" || tqlayoutName == "tml" || tqlayoutName == "ben" ) // some Indian languages
+			if( layoutName == "ml" || layoutName == "dev" || layoutName == "gur" 
+						 || layoutName == "guj" || layoutName == "kan" || layoutName == "ori" 
+						 || layoutName == "tel" || layoutName == "tml" || layoutName == "ben" ) // some Indian languages
 				flag = "in";
 		else {
-			int sepPos = tqlayoutName.find(TQRegExp("[-_]"));
-			TQString leftCode = tqlayoutName.mid(0, sepPos);
+			int sepPos = layoutName.find(TQRegExp("[-_]"));
+			TQString leftCode = layoutName.mid(0, sepPos);
 			TQString rightCode;
 			if( sepPos != -1 )
-				rightCode = tqlayoutName.mid(sepPos+1);
-//			kdDebug() << "tqlayout name breakup: " << leftCode << ":" << rightCode << endl;
+				rightCode = layoutName.mid(sepPos+1);
+//			kdDebug() << "layout name breakup: " << leftCode << ":" << rightCode << endl;
 	
 			if( rightCode.length() == 2 
 					&& TQRegExp("[A-Z][A-Z]").exactMatch(rightCode) ) {
@@ -211,7 +211,7 @@ void LayoutIcon::dimPixmap(TQPixmap& pm)
 		for(int x=0; x<image.width(); x++)
 	{
 		QRgb rgb = image.pixel(x,y);
-		QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4));
+		QRgb dimRgb(qRgb(qRed(rgb)*3/4, qGreen(rgb)*3/4, qBlue(rgb)*3/4));
 		image.setPixel(x, y, dimRgb);
 	}
 	pm.convertFromImage(image);
@@ -313,7 +313,7 @@ TQPixmap* LayoutIcon::createErrorPixmap()
 //   I18N_NOOP("Iranian"); // should be not Iranian but Farsi
    I18N_NOOP("Latin America");
    I18N_NOOP("Maltese");
-   I18N_NOOP("Maltese (US tqlayout)");
+   I18N_NOOP("Maltese (US layout)");
    I18N_NOOP("Northern Saami (Finland)");
    I18N_NOOP("Northern Saami (Norway)");
    I18N_NOOP("Northern Saami (Sweden)");