Fix incorrectly renamed strings

(cherry picked from commit 9d34e5cf6d90e425ab5b0e86884f3de7f682849a)

2 files changed, 42 insertions, 42 deletions

diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 0128f29f..fbc6249c 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -117,10 +117,10 @@ KviFrame::KviFrame()
 	m_pActiveContext = 0;
 
 	m_pDockExtension = 0;
-	
+
 	m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter");
 //	m_pSplitter->setFrameShape(TQFrame::NoFrame);
-	
+
 	setCentralWidget(m_pSplitter);
 
 	setUsesBigPixmaps(KVI_OPTION_BOOL(KviOption_boolUseBigIcons));
@@ -215,7 +215,7 @@ KviFrame::~KviFrame()
 	while(m_pWinList->first())
 		closeWindow(m_pWinList->first());
 	delete m_pWinList;
-	
+
 	delete m_pAccel;
 	g_pFrame = 0;
 }
@@ -544,7 +544,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection)
 //	KviWindow * top = g_pActiveWindow;
 //	if(!top)top = wnd;
 //	g_pWinPropertiesConfig->writeEntry("IsMaximized",top->isMaximized());
-	
+
 	g_pWinPropertiesConfig->writeEntry("WinRect",wnd->externalGeometry());
 
 	wnd->saveProperties(g_pWinPropertiesConfig);
@@ -591,7 +591,7 @@ void KviFrame::closeWindow(KviWindow *wnd)
 			pCandidate = m_pWinList->first();
 			if(pCandidate == wnd)pCandidate = 0;
 		}
-		
+
 		if(pCandidate)
 			childWindowActivated(pCandidate);
 		// else { m_pActiveWindow = 0; m_pActiveContext = 0; };
@@ -637,19 +637,19 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow)
 
 	{
 		wnd->loadProperties(g_pWinPropertiesConfig); // load it anyway (will set defaults if windows don't remember properties)
-	
+
 		if(KVI_OPTION_BOOL(KviOption_boolWindowsRememberProperties))
 		{
 			bool bDocked    = g_pWinPropertiesConfig->readBoolEntry("IsDocked",true);
 			//bool bMaximized = g_pWinPropertiesConfig->readBoolEntry("IsMaximized",false);
 			bool bMaximized;
-			
+
 			if(KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode))
 			{
 				bMaximized = true;
 				//KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode) = false;
 			} else bMaximized = false;
-			
+
 			TQRect rect      = g_pWinPropertiesConfig->readRectEntry("WinRect",TQRect(10,10,500,380));
 
 			if(bDocked)
@@ -687,7 +687,7 @@ void KviFrame::addWindow(KviWindow *wnd,bool bShow)
 			goto docking_done;
 		}
 	}
-	
+
 default_docking:
 	{
 		KviMdiChild * lpC = dockWindow(wnd,false); //cascade it
@@ -880,10 +880,10 @@ void KviFrame::childWindowActivated(KviWindow *wnd)
 	m_pTaskBar->setActiveItem(wnd->taskBarItem());
 
 	//wnd->gainedActiveWindowStatus(); // <-- atm unused
-	
+
 	if(g_pActiveWindow->view())
 		g_pActiveWindow->view()->clearUnreaded();
-	
+
 	emit activeWindowChanged();
 	if(bActiveContextChanged)emit activeContextChanged();
 
@@ -966,7 +966,7 @@ void KviFrame::closeEvent(TQCloseEvent *e)
 	if(KVI_OPTION_BOOL(KviOption_boolConfirmCloseWhenThereAreConnections))
 	{
 		// check for running connections
-		
+
 		bool bGotRunningConnection = false;
 		for(KviWindow * w = m_pWinList->first();w;w = m_pWinList->next())
 		{
@@ -979,14 +979,14 @@ void KviFrame::closeEvent(TQCloseEvent *e)
 				}
 			}
 		}
-		
+
 		if(bGotRunningConnection)
 		{
 			TQString txt = "<p>";
 			txt += __tr2qs("There are active connections, are you sure you wish to ");
 			txt += __tr2qs("quit KVIrc?");
 			txt += "</p>";
-	
+
 			switch(TQMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2))
 			{
 				case 0:
@@ -1045,7 +1045,7 @@ void KviFrame::applyOptions()
 	m_pMdi->update();
 	for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())wnd->applyOptions();
 	updateCaption();
-	
+
 	m_pTaskBar->applyOptions();
 }
 
@@ -1144,7 +1144,7 @@ void KviFrame::toolbarsPopupSelected(int id)
 	if(!o->inherits("KviTalPopupMenu"))return;
 	const KviTalPopupMenu * p = (const KviTalPopupMenu *)o;
 	int idext = p->itemParameter(id);
-	
+
 	KviCustomToolBarDescriptor * dd = KviCustomToolBarManager::instance()->findDescriptorByInternalId(idext);
 	if(dd)
 	{
@@ -1175,7 +1175,7 @@ bool KviFrame::focusNextPrevChild(bool next)
 #endif
 		//TQVariant v = w->property("KviProperty_FocusOwner");
 		//if(v.isValid())return false; // Do NOT change the focus widget!
-		
+
 		if(w->parent())
 		{
 			TQVariant v = w->parent()->property("KviProperty_ChildFocusOwner");
@@ -1220,9 +1220,9 @@ void KviFrame::restoreToolBarPositions()
 	g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS);
 
 	TQFile f(szTemp);
-	
+
 	bool bNeedDefaults = false;
-	
+
 	if(f.open(IO_ReadOnly))
 	{
 #ifdef COMPILE_USE_QT4
@@ -1250,11 +1250,11 @@ void KviFrame::restoreToolBarPositions()
 		{
 			// nope.... need to move it
 			a->removeDockWindow(m_pTaskBar,true,false);
-			
+
 			//int iMaxWidth = m_pTaskBar->maximumWidth();
 			leftDock()->moveDockWindow(m_pTaskBar);
 			//m_pTaskBar->setMaximumWidth(iMaxWidth);
-			//m_pTaskBar->setOrientationQt::Vertical);
+			//m_pTaskBar->setOrientationVertical);
 		}
 		// ensure that it is not too wide
 		if(m_pTaskBar->width() > 600)
@@ -1336,7 +1336,7 @@ void KviFrame::recreateTaskBar()
 		// the class changed...
 		// make sure that the tree task bar is in the left or right dock
 		// and the classic one is in the top or bottom on
-		
+
 		TQt::Dock dock;
 		int index;
 		bool nl;
@@ -1399,14 +1399,14 @@ void KviFrame::hideEvent ( TQHideEvent * e)
 	{
 		if(e->spontaneous())
 		{
-		
+
 		if(!dockExtension())
 		{
 			executeInternalCommand(KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW);
 		}
-			 TQTimer::singleShot( 0, this, TQT_SLOT(hide()) );	
+			 TQTimer::singleShot( 0, this, TQT_SLOT(hide()) );
 		}
-		
+
 	}
 }
 
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 039bf28b..5aab3116 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -99,7 +99,7 @@ KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name
 	setFocusPolicy(TQ_NoFocus);
 	viewport()->setFocusPolicy(TQ_NoFocus);
 #endif
-	
+
 	connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages()));
 }
 
@@ -210,11 +210,11 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
 			pOldTop->captionLabel()->setActive(false);
 			if(pOldTop->m_state != KviMdiChild::Maximized)pMaximizedChild=0;
 		}
-		
+
 		m_pZ->setAutoDelete(true);
 		m_pZ->append(lpC);
 
-		if(pMaximizedChild)lpC->maximize(); //do not animate the change	
+		if(pMaximizedChild)lpC->maximize(); //do not animate the change
 		lpC->raise();
 		if(pMaximizedChild)pMaximizedChild->restore();
 	}
@@ -227,7 +227,7 @@ void KviMdiManager::setTopChild(KviMdiChild *lpC,bool bSetFocus)
 			/*
 			if(topLevelWidget()->isActiveWindow())
 			{
-				
+
 			}
 			*/
 		}
@@ -337,7 +337,7 @@ void KviMdiManager::maximizeChild(KviMdiChild * lpC)
 		// make sure that the child is focused
 		lpC->setFocus();
 	}
-	
+
 	// fixme: we could hide all the other children now!
 }
 
@@ -554,9 +554,9 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
 	if(!m_pSdiCloseButton)
 	{
 		KviMenuBar * b = m_pFrm->mainMenuBar();
-	
+
 		TQWidget * pButtonParent;
-	
+
 #ifdef COMPILE_USE_QT4
 		m_pSdiControls = new KviTalHBox(b);
 		m_pSdiControls->setMargin(0);
@@ -601,7 +601,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
 		m_pSdiCloseButton->show();
 #endif
 		emit enteredSdiMode();
-		
+
 		setVScrollBarMode(KviTalScrollView::AlwaysOff);
 		setHScrollBarMode(KviTalScrollView::AlwaysOff);
 	}
@@ -707,17 +707,17 @@ void KviMdiManager::fillWindowPopup()
 	int ids[KVI_NUM_TILE_METHODS];
 	ids[KVI_TILE_METHOD_ANODINE] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Anodine's Full Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_ANODINE],KVI_TILE_METHOD_ANODINE);
-	ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 4-Grid")));
+	ids[KVI_TILE_METHOD_PRAGMA4HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 4-Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4HOR],KVI_TILE_METHOD_PRAGMA4HOR);
-	ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 4-Grid")));
+	ids[KVI_TILE_METHOD_PRAGMA4VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 4-Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA4VER],KVI_TILE_METHOD_PRAGMA4VER);
-	ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 6-Grid")));
+	ids[KVI_TILE_METHOD_PRAGMA6HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 6-Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6HOR],KVI_TILE_METHOD_PRAGMA6HOR);
-	ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 6-Grid")));
+	ids[KVI_TILE_METHOD_PRAGMA6VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 6-Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA6VER],KVI_TILE_METHOD_PRAGMA6VER);
-	ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Horizontal 9-Grid")));
+	ids[KVI_TILE_METHOD_PRAGMA9HOR] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Horizontal 9-Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9HOR],KVI_TILE_METHOD_PRAGMA9HOR);
-	ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma'sQt::Vertical 9-Grid")));
+	ids[KVI_TILE_METHOD_PRAGMA9VER] = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Pragma's Vertical 9-Grid")));
 	m_pTileMethodPopup->setItemParameter(ids[KVI_TILE_METHOD_PRAGMA9VER],KVI_TILE_METHOD_PRAGMA9VER);
 
 	if(KVI_OPTION_UINT(KviOption_uintTileMethod) >= KVI_NUM_TILE_METHODS)KVI_OPTION_UINT(KviOption_uintTileMethod) = KVI_TILE_METHOD_PRAGMA9HOR;
@@ -831,7 +831,7 @@ void KviMdiManager::cascadeMaximized()
 	updateScrollBars();
 	g_pApp->sendPostedEvents();
 	if(g_pApp->closingDown())return;
-	
+
 	int idx=0;
 	KviPointerList<KviMdiChild> list(*m_pZ);
 
@@ -863,7 +863,7 @@ void KviMdiManager::expandVertical()
 	updateScrollBars();
 	g_pApp->sendPostedEvents();
 	if(g_pApp->closingDown())return;
-	
+
 	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
 	while(!list.isEmpty())
@@ -889,7 +889,7 @@ void KviMdiManager::expandHorizontal()
 	updateScrollBars();
 	g_pApp->sendPostedEvents();
 	if(g_pApp->closingDown())return;
-	
+
 	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
 	while(!list.isEmpty())