splitted log translations from kvirc to its own translation file, merging it with logview;

improved hungarian notation


git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5751 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 207 insertions, 209 deletions

diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 4d67ad86d..7d5c5f3c1 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -65,11 +65,104 @@
 
 extern LogViewWindow * g_pLogViewWindow;
 
-LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lpFrm)
-: KviWindow(KviWindow::LogView,lpFrm,"logview"), KviModuleExtension(d)
+LogFile::LogFile(const QString & szName)
+{
+	/*
+	Log is in the format
+	$type_$nick.$network_$YYYY.$MM.$DD.log
+	Examples:
+	query_noldor.azzurra_2009.05.20.log
+	channel_#slackware.azzurra_2009.11.03.log
+	*/
+
+	m_szFilename = szName;
+
+	QFileInfo fi(m_szFilename);
+	QString szTmpName = fi.fileName();
+
+	m_bCompressed = (fi.suffix() == "gz");
+	if(m_bCompressed)
+	{
+		//removes trailing dot and extension
+		szTmpName.chop(3);
+	}
+	QString szTypeToken = szTmpName.section('_',0,0);
+	// Ignore non-logs files, this includes '.' and '..'
+	if(KviQString::equalCI(szTypeToken,"channel"))
+		m_type = Channel;
+	else if(KviQString::equalCI(szTypeToken,"console"))
+		m_type = Console;
+	else if(KviQString::equalCI(szTypeToken,"dccchat"))
+		m_type = DccChat;
+	else if(KviQString::equalCI(szTypeToken,"query"))
+		m_type = Query;
+	else
+		m_type = Other;
+
+	KviCString szUndecoded = szTmpName.section('.',0,0);
+	szUndecoded.cutToFirst('_');
+	m_szName = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
+
+	szUndecoded = szTmpName.section('.',1).section('_',0,-2);
+	m_szNetwork = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
+
+	QString szDate = szTmpName.section('_',-1).section('.',0,-2);
+	int iYear = szDate.section('.',0,0).toInt();
+	int iMonth = szDate.section('.',1,1).toInt();
+	int iDay = szDate.section('.',2,2).toInt();
+	m_date.setYMD(iYear,iMonth,iDay);
+
+	//qDebug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);
+}
+
+void LogFile::getText(QString & szText)
+{
+	QString szLogName = fileName();
+	QFile logFile;
+#ifdef COMPILE_ZLIB_SUPPORT
+	if(m_bCompressed)
+	{
+		gzFile file = gzopen(szLogName.toLocal8Bit().data(),"rb");
+		if(file)
+		{
+			char cBuff[1025];
+			int iLen;
+			QByteArray data;
+			//QCString data;
+			iLen = gzread(file,cBuff,1024);
+			while(iLen > 0)
+			{
+				cBuff[iLen] = 0;
+				data.append(cBuff);
+				iLen = gzread(file,cBuff,1024);
+			}
+			gzclose(file);
+			szText = QString::fromUtf8(data);
+		} else {
+			qDebug("Cannot open compressed file %s",szLogName.toLocal8Bit().data());
+		}
+	} else {
+#endif
+		logFile.setFileName(szLogName);
+
+		if(!logFile.open(QIODevice::ReadOnly))
+			return;
+
+		QByteArray bytes;
+		bytes = logFile.readAll();
+		szText = QString::fromUtf8(bytes.data(),bytes.size());
+		logFile.close();
+#ifdef COMPILE_ZLIB_SUPPORT
+	}
+#endif
+}
+
+
+LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * pDesc, KviMainWindow * pMain)
+: KviWindow(KviWindow::LogView,pMain,"log"),KviModuleExtension(pDesc)
 {
 	g_pLogViewWindow = this;
-//	m_pLogViewWidget = new KviLogViewWidget(this);
+	//m_pLogViewWidget = new KviLogViewWidget(this);
 
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
 	m_pSplitter->setObjectName("main_splitter");
@@ -81,83 +174,82 @@ LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lp
 	m_pProgressBar = new QProgressBar(m_pBottomLayout);
 	
 	m_pCancelButton = new QPushButton(m_pBottomLayout);
-	m_pCancelButton->setText(__tr2qs_ctx("Cancel","logview"));
+	m_pCancelButton->setText(__tr2qs_ctx("Cancel","log"));
 	connect(m_pCancelButton,SIGNAL(clicked()),this,SLOT(abortFilter()));
 	m_pBottomLayout->setVisible(false);
 
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
-	m_pTabWidget->addTab(m_pIndexTab,__tr2qs_ctx("HelpIndex","logview"));
+	m_pTabWidget->addTab(m_pIndexTab,__tr2qs_ctx("HelpIndex","log"));
 
 	m_pListView = new LogViewListView(m_pIndexTab);
 
 	connect(m_pListView,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(itemSelected(QTreeWidgetItem *,QTreeWidgetItem *)));
-	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)),
-		this,SLOT(rightButtonClicked(QTreeWidgetItem *,QPoint)));
+	connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,QPoint)),this,SLOT(rightButtonClicked(QTreeWidgetItem *,QPoint)));
 
 	m_pSearchTab  = new QWidget(m_pTabWidget);
-	m_pTabWidget->addTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
+	m_pTabWidget->addTab(m_pSearchTab,__tr2qs_ctx("Filter","log"));
 
-	QGridLayout *layout = new QGridLayout(m_pSearchTab);
+	QGridLayout * pLayout = new QGridLayout(m_pSearchTab);
 
-	m_pShowChannelsCheck = new QCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);
+	m_pShowChannelsCheck = new QCheckBox(__tr2qs_ctx("Show channel logs","log"),m_pSearchTab);
 	m_pShowChannelsCheck->setChecked(true);
-	layout->addWidget(m_pShowChannelsCheck,0,0,1,2);
+	pLayout->addWidget(m_pShowChannelsCheck,0,0,1,2);
 
-	m_pShowQueryesCheck  = new QCheckBox(__tr2qs_ctx("Show query logs","logview"),m_pSearchTab);
+	m_pShowQueryesCheck = new QCheckBox(__tr2qs_ctx("Show query logs","log"),m_pSearchTab);
 	m_pShowQueryesCheck->setChecked(true);
-	layout->addWidget(m_pShowQueryesCheck,1,0,1,2);
+	pLayout->addWidget(m_pShowQueryesCheck,1,0,1,2);
 
-	m_pShowConsolesCheck = new QCheckBox(__tr2qs_ctx("Show console logs","logview"),m_pSearchTab);
+	m_pShowConsolesCheck = new QCheckBox(__tr2qs_ctx("Show console logs","log"),m_pSearchTab);
 	m_pShowConsolesCheck->setChecked(true);
-	layout->addWidget(m_pShowConsolesCheck,2,0,1,2);
+	pLayout->addWidget(m_pShowConsolesCheck,2,0,1,2);
 
-	m_pShowDccChatCheck  = new QCheckBox(__tr2qs_ctx("Show DCC chat logs","logview"),m_pSearchTab);
+	m_pShowDccChatCheck = new QCheckBox(__tr2qs_ctx("Show DCC chat logs","log"),m_pSearchTab);
 	m_pShowDccChatCheck->setChecked(true);
-	layout->addWidget(m_pShowDccChatCheck,3,0,1,2);
+	pLayout->addWidget(m_pShowDccChatCheck,3,0,1,2);
 
-	m_pShowOtherCheck   = new QCheckBox(__tr2qs_ctx("Show other logs","logview"),m_pSearchTab);
+	m_pShowOtherCheck = new QCheckBox(__tr2qs_ctx("Show other logs","log"),m_pSearchTab);
 	m_pShowOtherCheck->setChecked(true);
-	layout->addWidget(m_pShowOtherCheck,4,0,1,2);
+	pLayout->addWidget(m_pShowOtherCheck,4,0,1,2);
 
-	QLabel *l;
-	l = new QLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
-	layout->addWidget(l,5,0,1,2);
+	QLabel * pLabel;
+	pLabel = new QLabel(__tr2qs_ctx("Contents filter","log"),m_pSearchTab);
+	pLayout->addWidget(pLabel,5,0,1,2);
 
-	l = new QLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
+	pLabel = new QLabel(__tr2qs_ctx("Log name mask:","log"),m_pSearchTab);
 	m_pFileNameMask = new QLineEdit(m_pSearchTab);
+	pLayout->addWidget(pLabel,6,0);
+	pLayout->addWidget(m_pFileNameMask,6,1);
 	connect(m_pFileNameMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
-	layout->addWidget(l,6,0);
-	layout->addWidget(m_pFileNameMask,6,1);
 
-	l = new QLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
+	pLabel = new QLabel(__tr2qs_ctx("Log contents mask:","log"),m_pSearchTab);
 	m_pContentsMask = new QLineEdit(m_pSearchTab);
+	pLayout->addWidget(pLabel,7,0);
+	pLayout->addWidget(m_pContentsMask,7,1);
 	connect(m_pContentsMask,SIGNAL(returnPressed()),this,SLOT(applyFilter()));
-	layout->addWidget(l,7,0);
-	layout->addWidget(m_pContentsMask,7,1);
 
-	m_pEnableFromFilter = new QCheckBox(__tr2qs_ctx("Only older than","logview"),m_pSearchTab);
+	m_pEnableFromFilter = new QCheckBox(__tr2qs_ctx("Only older than","log"),m_pSearchTab);
 	m_pFromDateEdit = new QDateEdit(m_pSearchTab);
 	m_pFromDateEdit->setDate(QDate::currentDate());
-	layout->addWidget(m_pEnableFromFilter,8,0);
-	layout->addWidget(m_pFromDateEdit,8,1);
-	connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool)));
 	m_pFromDateEdit->setEnabled(false);
+	pLayout->addWidget(m_pEnableFromFilter,8,0);
+	pLayout->addWidget(m_pFromDateEdit,8,1);
+	connect(m_pEnableFromFilter,SIGNAL(toggled(bool)),m_pFromDateEdit,SLOT(setEnabled(bool)));
 
-	m_pEnableToFilter = new QCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab);
+	m_pEnableToFilter = new QCheckBox(__tr2qs_ctx("Only newier than","log"),m_pSearchTab);
 	m_pToDateEdit = new QDateEdit(m_pSearchTab);
 	m_pToDateEdit->setDate(QDate::currentDate());
-	layout->addWidget(m_pEnableToFilter,9,0);
-	layout->addWidget(m_pToDateEdit,9,1);
-	connect(m_pEnableToFilter,SIGNAL(toggled(bool)),m_pToDateEdit,SLOT(setEnabled(bool)));
 	m_pToDateEdit->setEnabled(false);
+	pLayout->addWidget(m_pEnableToFilter,9,0);
+	pLayout->addWidget(m_pToDateEdit,9,1);
+	connect(m_pEnableToFilter,SIGNAL(toggled(bool)),m_pToDateEdit,SLOT(setEnabled(bool)));
 
-	m_pFilterButton = new QPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab);
+	m_pFilterButton = new QPushButton(__tr2qs_ctx("Apply filter","log"),m_pSearchTab);
+	pLayout->addWidget(m_pFilterButton,10,1);
 	connect(m_pFilterButton,SIGNAL(clicked()),this,SLOT(applyFilter()));
-	layout->addWidget(m_pFilterButton,10,1);
 
-	QWidget *w = new QWidget(m_pSearchTab);
-	w->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
-	layout->addWidget(w,11,1);
+	QWidget * pWidget = new QWidget(m_pSearchTab);
+	pWidget->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
+	pLayout->addWidget(pWidget,11,1);
 
 	m_pIrcView = new KviIrcView(m_pSplitter,g_pMainWindow,this);
 	m_pIrcView->setMaxBufferSize(INT_MAX);
@@ -168,16 +260,13 @@ LogViewWindow::LogViewWindow(KviModuleExtensionDescriptor * d,KviMainWindow * lp
 	li.append(width()-110);
 	m_pSplitter->setSizes(li);
 
-	g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApplication::Log);
-	KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
-
 	m_pTimer = new QTimer(this);
 	m_pTimer->setSingleShot(true);
 	m_pTimer->setInterval(0);
-	connect(m_pTimer, SIGNAL(timeout()), this, SLOT(filterNext()));
+	connect(m_pTimer,SIGNAL(timeout()),this,SLOT(filterNext()));
 	//avoid to execute the long time-consuming procedure of log indexing here:
 	//we could still be inside the context of the "Browse log files" QAction
-	QTimer::singleShot( 0, this, SLOT(cacheFileList()) );
+	QTimer::singleShot(0,this,SLOT(cacheFileList()));
 }
 
 LogViewWindow::~LogViewWindow()
@@ -185,19 +274,17 @@ LogViewWindow::~LogViewWindow()
 	g_pLogViewWindow = 0;
 }
 
-void LogViewWindow::keyPressEvent(QKeyEvent *e)
+void LogViewWindow::keyPressEvent(QKeyEvent * pEvent)
 {
-//Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX.
-//This way typical X11 and Apple shortcuts can be used simultanously within the input line.
-	if((e->modifiers() & Qt::ControlModifier) || (e->modifiers() & Qt::AltModifier) || (e->modifiers() & Qt::MetaModifier))
+	if((pEvent->modifiers() & Qt::ControlModifier) || (pEvent->modifiers() & Qt::AltModifier) || (pEvent->modifiers() & Qt::MetaModifier))
 	{
-		if(e->key() == Qt::Key_F)
+		if(pEvent->key() == Qt::Key_F)
 		{
 			m_pIrcView->toggleToolWidget();
 			return;
 		}
 	}
-	KviWindow::keyPressEvent(e);
+	KviWindow::keyPressEvent(pEvent);
 }
 
 void LogViewWindow::applyFilter()
@@ -217,7 +304,7 @@ void LogViewWindow::resizeEvent(QResizeEvent *)
 
 void LogViewWindow::fillCaptionBuffers()
 {
-	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","logview");
+	m_szPlainTextCaption = __tr2qs_ctx("Log Viewer","log");
 }
 
 void LogViewWindow::die()
@@ -241,7 +328,7 @@ void LogViewWindow::setupItemList()
 
 	m_bAborted=false;
 	m_pBottomLayout->setVisible(true);
-	m_pProgressBar->setRange(0, m_logList.count());
+	m_pProgressBar->setRange(0,m_logList.count());
 	m_pProgressBar->setValue(0);
 
 	m_pLastCategory=0;
@@ -252,13 +339,13 @@ void LogViewWindow::setupItemList()
 
 void LogViewWindow::abortFilter()
 {
-	m_bAborted=true;
+	m_bAborted = true;
 }
 
 void LogViewWindow::filterNext()
 {
 	QString szCurGroup;
-	LogFile * pFile=m_logList.current();
+	LogFile * pFile = m_logList.current();
 	if(!pFile)
 		goto filter_last;
 
@@ -287,9 +374,9 @@ void LogViewWindow::filterNext()
 
 	if(!m_pContentsMask->text().isEmpty())
 	{
-		QString textBuffer;
-		pFile->getText(textBuffer,m_szLogDirectory);
-		if(!KviQString::matchString(m_pContentsMask->text(),textBuffer))
+		QString szBuffer;
+		pFile->getText(szBuffer);
+		if(!KviQString::matchString(m_pContentsMask->text(),szBuffer))
 			goto filter_next;
 	}
 
@@ -298,7 +385,7 @@ void LogViewWindow::filterNext()
 		if(m_pLastCategory->m_type!=pFile->type())
 		{
 			m_pLastCategory=0;
-			for(int i=0;i<m_pListView->topLevelItemCount(); ++i)
+			for(int i=0; i < m_pListView->topLevelItemCount(); ++i)
 			{
 				LogListViewItemType * pTmp = (LogListViewItemType*) m_pListView->topLevelItem(i);
 				if(pTmp->m_type == pFile->type())
@@ -314,24 +401,24 @@ void LogViewWindow::filterNext()
 		m_pLastCategory = new LogListViewItemType(m_pListView,pFile->type());
 	}
 
-	szCurGroup = QString(__tr2qs_ctx("%1 on %2","logview")).arg(pFile->name(),pFile->network());
+	szCurGroup = QString(__tr2qs_ctx("%1 on %2","log")).arg(pFile->name(),pFile->network());
 
-	if(m_szLastGroup!=szCurGroup)
+	if(m_szLastGroup != szCurGroup)
 	{
-		m_szLastGroup=szCurGroup;
-		m_pLastGroupItem=0;
-		for(int i=0;i<m_pLastCategory->childCount(); ++i)
+		m_szLastGroup = szCurGroup;
+		m_pLastGroupItem = 0;
+		for(int i=0; i < m_pLastCategory->childCount(); ++i)
 		{
 			LogListViewItemFolder * pTmp = (LogListViewItemFolder*) m_pLastCategory->child(i);
 			if(pTmp->text(0) == m_szLastGroup)
 			{
-				m_pLastGroupItem=pTmp;
+				m_pLastGroupItem = pTmp;
 				break;
 			}
 		}
 		
 		if(!m_pLastGroupItem)
-			m_pLastGroupItem=new LogListViewItemFolder(m_pLastCategory,m_szLastGroup);
+			m_pLastGroupItem = new LogListViewItemFolder(m_pLastCategory,m_szLastGroup);
 	}
 
 	new LogListViewLog(m_pLastGroupItem,pFile->type(),pFile);
@@ -354,51 +441,49 @@ filter_last:
 
 void LogViewWindow::cacheFileList()
 {
-	QString logPath;
-	g_pApp->getLocalKvircDirectory(logPath,KviApplication::Log);
-	recurseDirectory(logPath);
+	QString szLogPath;
+	g_pApp->getLocalKvircDirectory(szLogPath,KviApplication::Log);
+	recurseDirectory(szLogPath);
 
 	setupItemList();
 }
 
-void LogViewWindow::recurseDirectory(const QString& sDir)
+void LogViewWindow::recurseDirectory(const QString & szDir)
 {
-	QDir dir(sDir);
+	QDir dir(szDir);
 	QFileInfoList list = dir.entryInfoList();
-	for (int iList=0;iList<list.count();iList++)
+	for(int iList=0; iList < list.count(); iList++)
 	{
 		QFileInfo info = list[iList];
-		if (info.isDir())
+		if(info.isDir())
 		{
 			// recursive
-			if (info.fileName()!=".." && info.fileName()!=".")
-			{
+			if(info.fileName()!=".." && info.fileName()!=".")
 				recurseDirectory(info.filePath());
-			}
-		} else if(info.suffix()=="gz" || info.suffix()=="log") {
+		} else if(info.suffix() == "gz" || info.suffix() == "log")
+		{
 			m_logList.append(new LogFile(info.filePath()));
 		}
 	}
 }
 
-void LogViewWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
+void LogViewWindow::itemSelected(QTreeWidgetItem * it, QTreeWidgetItem *)
 {
 	//A parent node
 	m_pIrcView->clearBuffer();
-	if(!it || !it->parent() || !(((LogListViewItem *)it)->m_pFileData) )
-	{
+	if(!it || !it->parent() || !(((LogListViewItem *)it)->m_pFileData))
 		return;
-	}
 
-	QString text;
-	((LogListViewItem *)it)->m_pFileData->getText(text,m_szLogDirectory);
+	QString szText;
+	((LogListViewItem *)it)->m_pFileData->getText(szText);
 
-	QStringList lines= text.split('\n');
+	QStringList lines = szText.split('\n');
 	bool bOk;
 	int iMsgType;
-	for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
-		QString num=(*it).section(' ',0,0);
-		iMsgType=num.toInt(&bOk);
+	for(QStringList::Iterator it = lines.begin(); it != lines.end(); ++it)
+	{
+		QString szNum = (*it).section(' ',0,0);
+		iMsgType = szNum.toInt(&bOk);
 		if(bOk)
 			outputNoFmt(iMsgType,(*it).section(' ',1),KviIrcView::NoRepaint | KviIrcView::NoTimestamp);
 		else
@@ -407,45 +492,47 @@ void LogViewWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
 	m_pIrcView->repaint();
 }
 
-void LogViewWindow::rightButtonClicked ( QTreeWidgetItem * it, const QPoint &)
+void LogViewWindow::rightButtonClicked( QTreeWidgetItem * it, const QPoint &)
 {
-	if(!it) return;
+	if(!it)
+		return;
 	m_pListView->setCurrentItem(it);
 
-	KviTalPopupMenu* popup = new KviTalPopupMenu(this);
+	KviTalPopupMenu * pPopup = new KviTalPopupMenu(this);
 	if(((LogListViewItem *)it)->childCount())
-		popup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove all these channel/query log files","logview"),this,SLOT(deleteCurrent()));
-	else popup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent()));
+		pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove all these channel/query log files","log"),this,SLOT(deleteCurrent()));
+	else
+		pPopup->insertItem(*(g_pIconManager->getSmallIcon(KviIconManager::Quit)),__tr2qs_ctx("Remove file","log"),this,SLOT(deleteCurrent()));
 
-	popup->exec( QCursor::pos() );
+	pPopup->exec(QCursor::pos());
 }
 
 void LogViewWindow::deleteCurrent()
 {
-	LogListViewItem* pItem = (LogListViewItem *)(m_pListView->currentItem());
+	LogListViewItem * pItem = (LogListViewItem *)(m_pListView->currentItem());
 	if(pItem)
 	{
-		if (pItem->childCount())
+		if(pItem->childCount())
 		{
 			if(QMessageBox::question(
 				this,
-				__tr2qs_ctx("Confirm current user logs delete","logview"),
-				__tr2qs_ctx("Do you really wish to delete all these channel/query logs?","logview"),
-				__tr2qs("&Yes"),__tr2qs("&No"),0,1
-			) != 0) return;
+				__tr2qs_ctx("Confirm current user logs delete","log"),
+				__tr2qs_ctx("Do you really wish to delete all these channel/query logs?","log"),
+				__tr2qs("&Yes"),__tr2qs("&No"),0,1) != 0)
+				return;
 			KviPointerList <LogListViewItem> itemsList;
 			itemsList.setAutoDelete(false);
-			for(int i=0;i<pItem->childCount();i++)
+			for(int i=0; i < pItem->childCount(); i++)
 			{
-				if (!pItem->child(i)->childCount())
+				if(!pItem->child(i)->childCount())
 				{
 					itemsList.append((LogListViewItem*)pItem->child(i));
 					continue;
 				}
-				LogListViewItem* pChild=(LogListViewItem*)pItem->child(i);
-				for(int j=0;j<pChild->childCount();j++)
+				LogListViewItem * pChild = (LogListViewItem*)pItem->child(i);
+				for(int j=0; j < pChild->childCount(); j++)
 				{
-					if (!(LogListViewItem*)pChild->child(j))
+					if(!(LogListViewItem*)pChild->child(j))
 					{
 						qDebug("Null pointer in logviewitem");
 						continue;
@@ -453,9 +540,9 @@ void LogViewWindow::deleteCurrent()
 					itemsList.append((LogListViewItem*)pChild->child(j));
 				}
 			}
-			for(unsigned int i=0;i<itemsList.count();i++)
+			for(unsigned int u=0; u < itemsList.count(); u++)
 			{
-				LogListViewItem *pCurItem=itemsList.at(i);
+				LogListViewItem * pCurItem = itemsList.at(u);
 				if(!pCurItem->fileName().isNull())
 				{
 					QString szFname;
@@ -466,132 +553,43 @@ void LogViewWindow::deleteCurrent()
 			delete pItem;
 			return;
 		}
-			if(!pItem->fileName().isNull())
+		if(!pItem->fileName().isNull())
 		{
 			QString szFname;
 			g_pApp->getLocalKvircDirectory(szFname,KviApplication::Log,pItem->fileName());
 			KviFileUtils::removeFile(szFname);
 			delete pItem;
 			m_pIrcView->clearBuffer();
-			if (!pItem->parent()->childCount()) delete pItem->parent();
+			if(!pItem->parent()->childCount())
+				delete pItem->parent();
 		}
 	}
 }
 
-LogFile::LogFile(const QString & szName)
-{
-	/*
-	Log is in the format
-	$type_$nick.$network_$YYYY.$MM.$DD.log
-	Examples:
-	query_noldor.azzurra_2009.05.20.log
-	channel_#slackware.azzurra_2009.11.03.log
-	*/
-
-	m_szFilename = szName;
-
-	QFileInfo fi(m_szFilename);
-	QString szTmpName = fi.fileName();
-
-	m_bCompressed = (fi.suffix() == "gz");
-	if(m_bCompressed)
-	{
-		//removes trailing dot and extension
-		szTmpName.chop(3);
-	}
-	QString szTypeToken = szTmpName.section('_',0,0);
-	// Ignore non-logs files, this includes '.' and '..'
-	if(KviQString::equalCI(szTypeToken,"channel"))
-		m_type = Channel;
-	else if(KviQString::equalCI(szTypeToken,"console"))
-		m_type = Console;
-	else if(KviQString::equalCI(szTypeToken,"dccchat"))
-		m_type = DccChat;
-	else if(KviQString::equalCI(szTypeToken,"query"))
-		m_type = Query;
-	else
-		m_type = Other;
-
-	KviCString szUndecoded = szTmpName.section('.',0,0);
-	szUndecoded.cutToFirst('_');
-	m_szName = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
-
-	szUndecoded = szTmpName.section('.',1).section('_',0,-2);
-	m_szNetwork = szUndecoded.hexDecode(szUndecoded.ptr()).ptr();
-
-	QString szDate = szTmpName.section('_',-1).section('.',0,-2);
-	int iYear = szDate.section('.',0,0).toInt();
-	int iMonth = szDate.section('.',1,1).toInt();
-	int iDay = szDate.section('.',2,2).toInt();
-	m_date.setYMD(iYear,iMonth,iDay);
-
-	//qDebug("type=%i, name=%s, net=%s, date=%i %i %i",m_type,m_szName.ascii(),m_szNetwork.ascii(),iYear,iMonth,iDay);
-}
-
-void LogFile::getText(QString & text,const QString&)
-{
-	QString logName = fileName();
-	QFile logFile;
-#ifdef COMPILE_ZLIB_SUPPORT
-	if(m_bCompressed)
-	{
-		gzFile file=gzopen(logName.toLocal8Bit().data(),"rb");
-		if(file)
-		{
-			char buff[1025];
-			int len;
-			QByteArray data;
-			//QCString data;
-			len=gzread(file,buff,1024);
-			while(len>0)
-			{
-				buff[len]=0;
-				data.append(buff);
-				len=gzread(file,buff,1024);
-			}
-			gzclose(file);
-			text = QString::fromUtf8(data);
-		} else {
-			qDebug("Cannot open compressed file %s",logName.toLocal8Bit().data());
-		}
-	} else {
-#endif
-		logFile.setFileName(logName);
-
-		if(!logFile.open(QIODevice::ReadOnly))
-		return;
-
-		QByteArray bytes;
-		bytes=logFile.readAll();
-		text = QString::fromUtf8(bytes.data(), bytes.size());
-		logFile.close();
-#ifdef COMPILE_ZLIB_SUPPORT
-	}
-#endif
-}
 
-LogViewListView::LogViewListView(QWidget * par)
-: QTreeWidget(par)
+LogViewListView::LogViewListView(QWidget * pParent)
+: QTreeWidget(pParent)
 {
 	header()->setSortIndicatorShown(true);
 	setColumnCount(1);
-	setHeaderLabel(__tr2qs_ctx("Log File","logview"));
+	setHeaderLabel(__tr2qs_ctx("Log File","log"));
 	setSelectionMode(QAbstractItemView::SingleSelection);
 	setSortingEnabled(true);
 	setRootIsDecorated(true);
 	setAnimated(true);
 }
 
-void LogViewListView::mousePressEvent (QMouseEvent *e)
+void LogViewListView::mousePressEvent(QMouseEvent * pEvent)
 {
-	if (e->button() == Qt::RightButton)
+	if(pEvent->button() == Qt::RightButton)
 	{
-		QTreeWidgetItem *i=itemAt(e->pos());
-		if (i) emit rightButtonPressed(i,QCursor::pos());
+		QTreeWidgetItem * pItem = itemAt(pEvent->pos());
+		if(pItem)
+			emit rightButtonPressed(pItem,QCursor::pos());
 	}
-	QTreeWidget::mousePressEvent(e);
+	QTreeWidget::mousePressEvent(pEvent);
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "LogViewWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+#endif //COMPILE_USE_STANDALONE_MOC_SOURCES