aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/links
diff options
context:
space:
mode:
authorGravatar Alexey Sokolov2016-04-29 23:57:30 +0100
committerGravatar Alexey Sokolov2016-04-29 23:57:48 +0100
commit690dd7a33ddc90678367d73adf313533536e10f2 (patch)
tree2276fe7c384ebbc222b40a19c536d5c3c5606ce8 /src/modules/links
parentAdd config for clang-format. (diff)
downloadKVIrc-690dd7a33ddc90678367d73adf313533536e10f2.tar.gz
KVIrc-690dd7a33ddc90678367d73adf313533536e10f2.tar.bz2
KVIrc-690dd7a33ddc90678367d73adf313533536e10f2.zip
Apply clang-format
Diffstat (limited to 'src/modules/links')
-rw-r--r--src/modules/links/LinksWindow.cpp384
-rw-r--r--src/modules/links/LinksWindow.h34
-rw-r--r--src/modules/links/libkvilinks.cpp32
3 files changed, 251 insertions, 199 deletions
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index 772406a1f..c29bd1ede 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -45,11 +45,11 @@
extern KviPointerList<LinksWindow> * g_pLinksWindowList;
LinksWindow::LinksWindow(KviConsoleWindow * lpConsole)
-: KviWindow(KviWindow::Links,"links",lpConsole), KviExternalServerDataParser()
+ : KviWindow(KviWindow::Links, "links", lpConsole), KviExternalServerDataParser()
{
g_pLinksWindowList->append(this);
- m_pTopSplitter = new KviTalSplitter(Qt::Horizontal,this);
+ m_pTopSplitter = new KviTalSplitter(Qt::Horizontal, this);
m_pTopSplitter->setObjectName("top_splitter");
m_pTopSplitter->setChildrenCollapsible(false);
@@ -58,38 +58,38 @@ LinksWindow::LinksWindow(KviConsoleWindow * lpConsole)
m_pRequestButton = new QToolButton(box);
m_pRequestButton->setObjectName("request_button");
- m_pRequestButton->setIconSize(QSize(16,16));
+ m_pRequestButton->setIconSize(QSize(16, 16));
m_pRequestButton->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Update)));
- connect(m_pRequestButton,SIGNAL(clicked()),this,SLOT(requestLinks()));
+ connect(m_pRequestButton, SIGNAL(clicked()), this, SLOT(requestLinks()));
m_pRequestButton->setToolTip(__tr2qs("Request links"));
QLabel * l = new QLabel(box);
- box->setStretchFactor(l,1);
+ box->setStretchFactor(l, 1);
m_pInfoLabel = new KviThemedLabel(m_pTopSplitter, this, "info_label");
- connect(lpConsole->context(),SIGNAL(stateChanged()),
- this,SLOT(connectionStateChange()));
+ connect(lpConsole->context(), SIGNAL(stateChanged()),
+ this, SLOT(connectionStateChange()));
- m_pSplitter = new KviTalSplitter(Qt::Horizontal,this);
+ m_pSplitter = new KviTalSplitter(Qt::Horizontal, this);
m_pSplitter->setObjectName("splitter");
m_pSplitter->setChildrenCollapsible(false);
- m_pVertSplitter = new KviTalSplitter(Qt::Vertical,m_pSplitter);
+ m_pVertSplitter = new KviTalSplitter(Qt::Vertical, m_pSplitter);
m_pVertSplitter->setObjectName("vsplitter");
m_pVertSplitter->setChildrenCollapsible(false);
- m_pListView = new LinksListView(m_pVertSplitter, this, "links_treewidget");
+ m_pListView = new LinksListView(m_pVertSplitter, this, "links_treewidget");
- connect(m_pListView,SIGNAL(rightButtonPressed(QTreeWidgetItem *,const QPoint &)),
- this,SLOT(showHostPopup(QTreeWidgetItem *,const QPoint &)));
+ connect(m_pListView, SIGNAL(rightButtonPressed(QTreeWidgetItem *, const QPoint &)),
+ this, SLOT(showHostPopup(QTreeWidgetItem *, const QPoint &)));
- m_pIrcView = new KviIrcView(m_pVertSplitter,this);
+ m_pIrcView = new KviIrcView(m_pVertSplitter, this);
m_pLinkList = new KviPointerList<KviLink>;
m_pLinkList->setAutoDelete(true);
m_pHostPopup = new QMenu();
- connect(m_pHostPopup,SIGNAL(triggered(QAction*)),this,SLOT(hostPopupClicked(QAction *)));
+ connect(m_pHostPopup, SIGNAL(triggered(QAction *)), this, SLOT(hostPopupClicked(QAction *)));
connectionStateChange();
@@ -106,9 +106,9 @@ LinksWindow::~LinksWindow()
delete m_pHostPopup;
}
-void LinksWindow::getBaseLogFileName(QString &buffer)
+void LinksWindow::getBaseLogFileName(QString & buffer)
{
- buffer.sprintf("LINKS_%d",context()->id());
+ buffer.sprintf("LINKS_%d", context()->id());
}
void LinksWindow::requestLinks()
@@ -116,10 +116,12 @@ void LinksWindow::requestLinks()
if(m_pConsole->isConnected())
{
m_pConsole->connection()->sendFmtData("links");
- outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Sent links request, waiting for reply..."));
+ outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Sent links request, waiting for reply..."));
m_pRequestButton->setEnabled(false);
- } else {
- outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Can't request links: no active connection"));
+ }
+ else
+ {
+ outputNoFmt(KVI_OUT_SYSTEMERROR, __tr2qs("Can't request links: no active connection"));
}
}
@@ -129,9 +131,11 @@ void LinksWindow::connectionStateChange()
m_pRequestButton->setEnabled(st == KviIrcContext::Connected);
if(st == KviIrcContext::Connected)
{
- QString szTmp = QString(__tr2qs("Connected to %1 (%2)")).arg(m_pConsole->connection()->currentServerName(),m_pConsole->currentNetworkName());
+ QString szTmp = QString(__tr2qs("Connected to %1 (%2)")).arg(m_pConsole->connection()->currentServerName(), m_pConsole->currentNetworkName());
m_pInfoLabel->setText(szTmp);
- } else {
+ }
+ else
+ {
m_pInfoLabel->setText(__tr2qs("Links can't be requested: not connected to a server"));
}
}
@@ -144,14 +148,14 @@ QPixmap * LinksWindow::myIconPtr()
void LinksWindow::resizeEvent(QResizeEvent *)
{
int hght2 = m_pTopSplitter->sizeHint().height();
- m_pTopSplitter->setGeometry(0,0,width(),hght2);
- m_pSplitter->setGeometry(0,hght2,width(),height() - hght2);
+ m_pTopSplitter->setGeometry(0, 0, width(), hght2);
+ m_pSplitter->setGeometry(0, hght2, width(), height() - hght2);
}
QSize LinksWindow::sizeHint() const
{
QSize ret(m_pSplitter->sizeHint().width(),
- m_pSplitter->sizeHint().height() + m_pTopSplitter->sizeHint().height());
+ m_pSplitter->sizeHint().height() + m_pTopSplitter->sizeHint().height());
return ret;
}
@@ -169,8 +173,12 @@ void LinksWindow::control(int message)
{
switch(message)
{
- case EXTERNAL_SERVER_DATA_PARSER_CONTROL_RESET: reset(); break;
- case EXTERNAL_SERVER_DATA_PARSER_CONTROL_ENDOFDATA: endOfLinks(); break;
+ case EXTERNAL_SERVER_DATA_PARSER_CONTROL_RESET:
+ reset();
+ break;
+ case EXTERNAL_SERVER_DATA_PARSER_CONTROL_ENDOFDATA:
+ endOfLinks();
+ break;
}
}
@@ -181,74 +189,90 @@ void LinksWindow::endOfLinks()
m_pListView->clear();
//m_pListView->setSorting(-1);
- outputNoFmt(KVI_OUT_SYSTEMMESSAGE,"======================");
- outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Received end of links."));
- outputNoFmt(KVI_OUT_SYSTEMMESSAGE,"======================");
+ outputNoFmt(KVI_OUT_SYSTEMMESSAGE, "======================");
+ outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Received end of links."));
+ outputNoFmt(KVI_OUT_SYSTEMMESSAGE, "======================");
- QTreeWidgetItem * it = 0;
+ QTreeWidgetItem * it = 0;
QTreeWidgetItem * root = 0;
- int totalHosts = 0;
- int totalHops = 0;
- int maxHops = 0;
- int avgHops = 0;
+ int totalHosts = 0;
+ int totalHops = 0;
+ int maxHops = 0;
+ int avgHops = 0;
int directLinks = 0;
- int nearLinks = 0;
+ int nearLinks = 0;
int brokenLinks = 0;
- int maxLinks = 0;
- int farLinks = 0;
+ int maxLinks = 0;
+ int farLinks = 0;
int wildServers = 0;
- KviCString szMaxHop,szMaxLinks;
+ KviCString szMaxHop, szMaxLinks;
m_pListView->setUpdatesEnabled(false);
- for(KviLink *l=m_pLinkList->first();l;l=m_pLinkList->next()){
+ for(KviLink * l = m_pLinkList->first(); l; l = m_pLinkList->next())
+ {
totalHosts++;
if(l->hops == 0)
{
root = new QTreeWidgetItem(m_pListView);
- root->setText(0,QString(l->host.ptr()));
- root->setText(1,QString("0"));
- root->setText(2,QString(l->description.ptr()));
- } else {
+ root->setText(0, QString(l->host.ptr()));
+ root->setText(1, QString("0"));
+ root->setText(2, QString(l->description.ptr()));
+ }
+ else
+ {
totalHops += l->hops;
- if(l->hops < 4){
+ if(l->hops < 4)
+ {
nearLinks++;
- if(l->hops == 1)directLinks++;
- } else {
- if(l->hops >= 7)farLinks++;
+ if(l->hops == 1)
+ directLinks++;
+ }
+ else
+ {
+ if(l->hops >= 7)
+ farLinks++;
}
- if(l->hops == maxHops){
+ if(l->hops == maxHops)
+ {
szMaxHop.append(',');
szMaxHop.append(l->host);
- } else if(l->hops > maxHops){
+ }
+ else if(l->hops > maxHops)
+ {
maxHops = l->hops;
szMaxHop = l->host;
}
- if(l->host.contains('*'))wildServers++;
+ if(l->host.contains('*'))
+ wildServers++;
it = insertLink(l);
if(!it)
{
- output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
- l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
+ output(KVI_OUT_SYSTEMERROR, __tr2qs("Broken link: missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
+ l->parent.ptr(), l->host.ptr(), l->hops, l->description.ptr());
brokenLinks++;
- QString szTmp = QString(__tr2qs("%1: Parent link %2")).arg(l->description.ptr(),l->parent.ptr());
- KviCString tmp2(KviCString::Format,"%d",l->hops);
+ QString szTmp = QString(__tr2qs("%1: Parent link %2")).arg(l->description.ptr(), l->parent.ptr());
+ KviCString tmp2(KviCString::Format, "%d", l->hops);
if(root)
{
it = new QTreeWidgetItem(root);
- it->setText(0,QString(l->host.ptr()));
- it->setText(1,QString(tmp2.ptr()));
- it->setText(2,szTmp);
- } else {
- outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Warning: no root link was sent by the server, the stats may be invalid."));
+ it->setText(0, QString(l->host.ptr()));
+ it->setText(1, QString(tmp2.ptr()));
+ it->setText(2, szTmp);
+ }
+ else
+ {
+ outputNoFmt(KVI_OUT_SYSTEMERROR, __tr2qs("Warning: no root link was sent by the server, the stats may be invalid."));
it = new QTreeWidgetItem(m_pListView);
- it->setText(0,QString(l->host.ptr()));
- it->setText(1,QString(tmp2.ptr()));
- it->setText(2,szTmp);
+ it->setText(0, QString(l->host.ptr()));
+ it->setText(1, QString(tmp2.ptr()));
+ it->setText(2, szTmp);
}
- } else {
- it = (QTreeWidgetItem*) it->parent();
+ }
+ else
+ {
+ it = (QTreeWidgetItem *)it->parent();
if(it)
{
int links = it->childCount() + 1;
@@ -256,7 +280,8 @@ void LinksWindow::endOfLinks()
{
szMaxLinks.append(',');
szMaxLinks.append(it->text(0));
- } else if(links > maxLinks)
+ }
+ else if(links > maxLinks)
{
maxLinks = links;
szMaxLinks = it->text(0);
@@ -266,163 +291,179 @@ void LinksWindow::endOfLinks()
}
}
- avgHops = ((totalHosts > 0) ? ((totalHops * 100) / totalHosts) : 0 );
+ avgHops = ((totalHosts > 0) ? ((totalHops * 100) / totalHosts) : 0);
int nearProcent = ((totalHosts > 0) ? ((nearLinks * 10000) / totalHosts) : 0);
int directProcent = ((totalHosts > 0) ? ((directLinks * 10000) / totalHosts) : 0);
int midLinks = totalHosts - (farLinks + nearLinks + 1 + brokenLinks);
- if(midLinks < 0)midLinks = 0;
+ if(midLinks < 0)
+ midLinks = 0;
int midProcent = ((totalHosts > 0) ? ((midLinks * 10000) / totalHosts) : 0);
int farProcent = ((totalHosts > 0) ? ((farLinks * 10000) / totalHosts) : 0);
- outputNoFmt(KVI_OUT_LINKS,"======================");
+ outputNoFmt(KVI_OUT_LINKS, "======================");
-// if(!root)root = m_pListView->firstChild();
+ // if(!root)root = m_pListView->firstChild();
if(root)
{
m_szRootServer = root->text(0);
- output(KVI_OUT_LINKS,__tr2qs("%c%cLinks for %Q"),KviControlCodes::Bold,KviControlCodes::Underline,&m_szRootServer);
- outputNoFmt(KVI_OUT_LINKS,"======================");
+ output(KVI_OUT_LINKS, __tr2qs("%c%cLinks for %Q"), KviControlCodes::Bold, KviControlCodes::Underline, &m_szRootServer);
+ outputNoFmt(KVI_OUT_LINKS, "======================");
QString tmpo = wildServers ? __tr2qs("Total hosts listed") : __tr2qs("Total hosts in the network");
- output(KVI_OUT_LINKS,"%Q: %d",&tmpo,totalHosts);
- if(wildServers)output(KVI_OUT_LINKS,__tr2qs("Wildcard servers (hubs?): %d"),wildServers);
- output(KVI_OUT_LINKS,__tr2qs("Direct links: %d (~%d.%d %)"),directLinks,directProcent / 100, directProcent % 100);
- output(KVI_OUT_LINKS,__tr2qs("Close links (1 <= hops <= 3): %d (~%d.%d %)"),nearLinks,nearProcent / 100,nearProcent % 100);
- output(KVI_OUT_LINKS,__tr2qs("Mid-range links (4 <= hops <= 6): %d (~%d.%d %)"),midLinks,midProcent / 100,midProcent % 100);
- output(KVI_OUT_LINKS,__tr2qs("Distant links (7 <= hops): %d (~%d.%d %)"),farLinks,farProcent / 100,farProcent % 100);
- output(KVI_OUT_LINKS,__tr2qs("Broken (unknown) links: %d"),brokenLinks);
- output(KVI_OUT_LINKS,__tr2qs("Maximum links per host: %d [%s]"),maxLinks,szMaxLinks.ptr());
- output(KVI_OUT_LINKS,__tr2qs("Total links: %d"),totalHops);
- output(KVI_OUT_LINKS,__tr2qs("Maximum hops: %d [%s]"),maxHops,szMaxHop.ptr());
- output(KVI_OUT_LINKS,__tr2qs("Average hops: ~%d.%d"),avgHops / 100,avgHops % 100);
- } else {
+ output(KVI_OUT_LINKS, "%Q: %d", &tmpo, totalHosts);
+ if(wildServers)
+ output(KVI_OUT_LINKS, __tr2qs("Wildcard servers (hubs?): %d"), wildServers);
+ output(KVI_OUT_LINKS, __tr2qs("Direct links: %d (~%d.%d %)"), directLinks, directProcent / 100, directProcent % 100);
+ output(KVI_OUT_LINKS, __tr2qs("Close links (1 <= hops <= 3): %d (~%d.%d %)"), nearLinks, nearProcent / 100, nearProcent % 100);
+ output(KVI_OUT_LINKS, __tr2qs("Mid-range links (4 <= hops <= 6): %d (~%d.%d %)"), midLinks, midProcent / 100, midProcent % 100);
+ output(KVI_OUT_LINKS, __tr2qs("Distant links (7 <= hops): %d (~%d.%d %)"), farLinks, farProcent / 100, farProcent % 100);
+ output(KVI_OUT_LINKS, __tr2qs("Broken (unknown) links: %d"), brokenLinks);
+ output(KVI_OUT_LINKS, __tr2qs("Maximum links per host: %d [%s]"), maxLinks, szMaxLinks.ptr());
+ output(KVI_OUT_LINKS, __tr2qs("Total links: %d"), totalHops);
+ output(KVI_OUT_LINKS, __tr2qs("Maximum hops: %d [%s]"), maxHops, szMaxHop.ptr());
+ output(KVI_OUT_LINKS, __tr2qs("Average hops: ~%d.%d"), avgHops / 100, avgHops % 100);
+ }
+ else
+ {
m_szRootServer = __tr2qs("(Unknown)");
- outputNoFmt(KVI_OUT_LINKS,__tr2qs("Incomplete links result, no stats available"));
+ outputNoFmt(KVI_OUT_LINKS, __tr2qs("Incomplete links result, no stats available"));
}
- outputNoFmt(KVI_OUT_LINKS,"======================");
+ outputNoFmt(KVI_OUT_LINKS, "======================");
updateCaption();
-
- while(!m_pLinkList->isEmpty())m_pLinkList->removeFirst();
+ while(!m_pLinkList->isEmpty())
+ m_pLinkList->removeFirst();
m_pListView->resizeColumnToContents(0);
m_pListView->setUpdatesEnabled(true);
m_pListView->repaint();
}
-QTreeWidgetItem * LinksWindow::insertLink(KviLink *l)
+QTreeWidgetItem * LinksWindow::insertLink(KviLink * l)
{
KVI_ASSERT(l->hops > 0);
- QTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
+ QTreeWidgetItem * i = getItemByHost(l->parent.ptr(), 0);
QTreeWidgetItem * it = 0;
if(!i)
{
return 0;
- } else {
- KviCString hops(KviCString::Format,"%d",l->hops);
+ }
+ else
+ {
+ KviCString hops(KviCString::Format, "%d", l->hops);
it = new QTreeWidgetItem(i);
- it->setText(0,QString(l->host.ptr()));
- it->setText(1,QString(hops.ptr()));
- it->setText(2,QString(l->description.ptr()));
+ it->setText(0, QString(l->host.ptr()));
+ it->setText(1, QString(hops.ptr()));
+ it->setText(2, QString(l->description.ptr()));
i->setExpanded(true);
}
return it;
}
-QTreeWidgetItem * LinksWindow::getItemByHost(const char *host,QTreeWidgetItem * par)
+QTreeWidgetItem * LinksWindow::getItemByHost(const char * host, QTreeWidgetItem * par)
{
KviCString tmp;
if(par)
{
- for(int i=0;i<par->childCount();i++)
+ for(int i = 0; i < par->childCount(); i++)
{
tmp = par->child(i)->text(0);
- if(kvi_strEqualCI(tmp.ptr(),host))return par->child(i);
- QTreeWidgetItem * ch = getItemByHost(host,par->child(i));
- if(ch)return ch;
+ if(kvi_strEqualCI(tmp.ptr(), host))
+ return par->child(i);
+ QTreeWidgetItem * ch = getItemByHost(host, par->child(i));
+ if(ch)
+ return ch;
}
- } else {
- for(int i=0;i<m_pListView->topLevelItemCount();i++)
+ }
+ else
+ {
+ for(int i = 0; i < m_pListView->topLevelItemCount(); i++)
{
tmp = m_pListView->topLevelItem(i)->text(0);
- if(kvi_strEqualCI(tmp.ptr(),host))return m_pListView->topLevelItem(i);
- QTreeWidgetItem * ch = getItemByHost(host,m_pListView->topLevelItem(i));
- if(ch)return ch;
+ if(kvi_strEqualCI(tmp.ptr(), host))
+ return m_pListView->topLevelItem(i);
+ QTreeWidgetItem * ch = getItemByHost(host, m_pListView->topLevelItem(i));
+ if(ch)
+ return ch;
}
}
return 0;
}
-void LinksWindow::showHostPopup(QTreeWidgetItem *i,const QPoint &p)
+void LinksWindow::showHostPopup(QTreeWidgetItem * i, const QPoint & p)
{
- if(!i)return;
- KviCString host=i->text(0);
- if(host.isEmpty())return;
+ if(!i)
+ return;
+ KviCString host = i->text(0);
+ if(host.isEmpty())
+ return;
m_pHostPopup->clear();
- KviCString tmp(KviCString::Format,"LINKS %s *",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Links)),tmp.ptr());
+ KviCString tmp(KviCString::Format, "LINKS %s *", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Links)), tmp.ptr());
m_pHostPopup->addSeparator();
- tmp.sprintf("TIME %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)),tmp.ptr());
- tmp.sprintf("ADMIN %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ChanUnOwner)),tmp.ptr());
- tmp.sprintf("INFO %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ServerInfo)),tmp.ptr());
- tmp.sprintf("MOTD %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Motd)),tmp.ptr());
- tmp.sprintf("VERSION %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)),tmp.ptr());
- tmp.sprintf("TRACE %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ServerPing)),tmp.ptr());
- tmp.sprintf("USERS %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::User)),tmp.ptr());
+ tmp.sprintf("TIME %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Time)), tmp.ptr());
+ tmp.sprintf("ADMIN %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ChanUnOwner)), tmp.ptr());
+ tmp.sprintf("INFO %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ServerInfo)), tmp.ptr());
+ tmp.sprintf("MOTD %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Motd)), tmp.ptr());
+ tmp.sprintf("VERSION %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)), tmp.ptr());
+ tmp.sprintf("TRACE %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::ServerPing)), tmp.ptr());
+ tmp.sprintf("USERS %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::User)), tmp.ptr());
m_pHostPopup->addSeparator();
- tmp.sprintf("STATS c %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS d %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS h %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS i %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS k %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS l %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS m %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS o %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS t %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS u %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS y %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
- tmp.sprintf("STATS z %s",host.ptr());
- m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)),tmp.ptr());
+ tmp.sprintf("STATS c %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS d %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS h %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS i %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS k %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS l %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS m %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS o %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS t %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS u %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS y %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
+ tmp.sprintf("STATS z %s", host.ptr());
+ m_pHostPopup->addAction(*(g_pIconManager->getSmallIcon(KviIconManager::Stats)), tmp.ptr());
m_pHostPopup->popup(p);
}
-void LinksWindow::hostPopupClicked(QAction *pAction)
+void LinksWindow::hostPopupClicked(QAction * pAction)
{
- KviCString tmp = pAction->text();
+ KviCString tmp = pAction->text();
if(tmp.hasData())
{
- if(!connection())output(KVI_OUT_SYSTEMERROR,__tr2qs("You're not connected to a server"));
+ if(!connection())
+ output(KVI_OUT_SYSTEMERROR, __tr2qs("You're not connected to a server"));
m_pConsole->connection()->sendData(tmp.ptr());
}
}
void LinksWindow::reset()
{
- outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Reset"));
- while(!m_pLinkList->isEmpty())m_pLinkList->removeFirst();
+ outputNoFmt(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Reset"));
+ while(!m_pLinkList->isEmpty())
+ m_pLinkList->removeFirst();
}
-void LinksWindow::processData(KviIrcMessage *msg)
+void LinksWindow::processData(KviIrcMessage * msg)
{
- output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Processing link: %s"),msg->allParams());
+ output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Processing link: %s"), msg->allParams());
KviLink * l = new KviLink;
l->host = msg->safeParam(1);
@@ -432,22 +473,26 @@ void LinksWindow::processData(KviIrcMessage *msg)
if(isdigit(*tr))
{
- const char *aux = tr;
- while(*tr && (isdigit(*tr)))tr++;
- KviCString tmp(aux,tr - aux);
+ const char * aux = tr;
+ while(*tr && (isdigit(*tr)))
+ tr++;
+ KviCString tmp(aux, tr - aux);
l->hops = tmp.toInt();
- } else {
- outputNoFmt(KVI_OUT_SYSTEMERROR,__tr2qs("Broken message syntax, can't extract hops number, assuming 0"));
+ }
+ else
+ {
+ outputNoFmt(KVI_OUT_SYSTEMERROR, __tr2qs("Broken message syntax, can't extract hops number, assuming 0"));
l->hops = 0;
}
- while(*tr && (*tr == ' '))tr++;
+ while(*tr && (*tr == ' '))
+ tr++;
l->description = tr;
- uint idx=0;
- for(KviLink *m=m_pLinkList->first();m;m=m_pLinkList->next())
+ uint idx = 0;
+ for(KviLink * m = m_pLinkList->first(); m; m = m_pLinkList->next())
{
if(m->hops >= l->hops)
{
- m_pLinkList->insert(idx,l);
+ m_pLinkList->insert(idx, l);
return;
}
idx++;
@@ -464,7 +509,7 @@ void LinksWindow::applyOptions()
}
LinksListView::LinksListView(QWidget * par, KviWindow * wnd, const char * txt)
-: KviThemedTreeWidget(par, wnd, txt)
+ : KviThemedTreeWidget(par, wnd, txt)
{
header()->setSortIndicatorShown(true);
setColumnCount(3);
@@ -475,12 +520,13 @@ LinksListView::LinksListView(QWidget * par, KviWindow * wnd, const char * txt)
setAllColumnsShowFocus(true);
}
-void LinksListView::mousePressEvent (QMouseEvent *e)
+void LinksListView::mousePressEvent(QMouseEvent * e)
{
- if (e->button() == Qt::RightButton)
+ if(e->button() == Qt::RightButton)
{
- QTreeWidgetItem *i=itemAt(e->pos());
- if (i) emit rightButtonPressed(i,QCursor::pos());
+ QTreeWidgetItem * i = itemAt(e->pos());
+ if(i)
+ emit rightButtonPressed(i, QCursor::pos());
}
KviThemedTreeWidget::mousePressEvent(e);
}
diff --git a/src/modules/links/LinksWindow.h b/src/modules/links/LinksWindow.h
index 1a9faddb8..7f991b8bd 100644
--- a/src/modules/links/LinksWindow.h
+++ b/src/modules/links/LinksWindow.h
@@ -51,10 +51,11 @@ class LinksListView : public KviThemedTreeWidget
public:
LinksListView(QWidget * par, KviWindow * wnd, const char * txt);
~LinksListView(){};
+
protected:
- void mousePressEvent (QMouseEvent *e);
+ void mousePressEvent(QMouseEvent * e);
signals:
- void rightButtonPressed(QTreeWidgetItem *,QPoint);
+ void rightButtonPressed(QTreeWidgetItem *, QPoint);
};
class LinksWindow : public KviWindow, public KviExternalServerDataParser
@@ -63,37 +64,42 @@ class LinksWindow : public KviWindow, public KviExternalServerDataParser
public:
LinksWindow(KviConsoleWindow * lpConsole);
~LinksWindow();
+
protected:
- QSplitter * m_pVertSplitter;
- QSplitter * m_pTopSplitter;
- LinksListView * m_pListView;
+ QSplitter * m_pVertSplitter;
+ QSplitter * m_pTopSplitter;
+ LinksListView * m_pListView;
KviPointerList<KviLink> * m_pLinkList;
- QMenu * m_pHostPopup;
- QString m_szRootServer;
- QToolButton * m_pRequestButton;
- KviThemedLabel * m_pInfoLabel;
+ QMenu * m_pHostPopup;
+ QString m_szRootServer;
+ QToolButton * m_pRequestButton;
+ KviThemedLabel * m_pInfoLabel;
+
public: // Methods
virtual void control(int msg);
virtual void processData(KviIrcMessage * msg);
virtual void die();
+
protected:
virtual QPixmap * myIconPtr();
virtual void fillCaptionBuffers();
virtual void applyOptions();
- virtual void resizeEvent(QResizeEvent *e);
- virtual void getBaseLogFileName(QString &buffer);
+ virtual void resizeEvent(QResizeEvent * e);
+ virtual void getBaseLogFileName(QString & buffer);
protected slots:
- void showHostPopup(QTreeWidgetItem *i,const QPoint &p);
- void hostPopupClicked(QAction *pAction);
+ void showHostPopup(QTreeWidgetItem * i, const QPoint & p);
+ void hostPopupClicked(QAction * pAction);
void requestLinks();
void connectionStateChange();
+
public:
virtual QSize sizeHint() const;
+
private:
void reset();
void endOfLinks();
QTreeWidgetItem * insertLink(KviLink * l);
- QTreeWidgetItem * getItemByHost(const char *host,QTreeWidgetItem * par);
+ QTreeWidgetItem * getItemByHost(const char * host, QTreeWidgetItem * par);
};
#endif //_KVI_LINKSWINDOW_H_
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 523f40470..b35d9a846 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -33,7 +33,6 @@
KviPointerList<LinksWindow> * g_pLinksWindowList = 0;
-
/*
@doc: links.open
@type:
@@ -63,13 +62,16 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
{
// FIND ME
- if(!c->window()->context())return c->context()->errorNoIrcContext();
+ if(!c->window()->context())
+ return c->context()->errorNoIrcContext();
if(!(c->window()->context()->linksWindow()))
{
- LinksWindow *w = new LinksWindow(c->window()->console());
+ LinksWindow * w = new LinksWindow(c->window()->console());
g_pMainWindow->addWindow(w);
- } else {
+ }
+ else
+ {
c->warning(__tr2qs("Links window already open for this IRC context"));
}
@@ -81,8 +83,7 @@ static bool links_module_init(KviModule * m)
g_pLinksWindowList = new KviPointerList<LinksWindow>;
g_pLinksWindowList->setAutoDelete(false);
-
- KVSM_REGISTER_SIMPLE_COMMAND(m,"open",links_kvs_cmd_open);
+ KVSM_REGISTER_SIMPLE_COMMAND(m, "open", links_kvs_cmd_open);
return true;
}
@@ -102,13 +103,12 @@ static bool links_module_can_unload(KviModule *)
}
KVIRC_MODULE(
- "Links", // module name
- "4.0.0", // module version
- "Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
- "Links window extension",
- links_module_init,
- links_module_can_unload,
- 0,
- links_module_cleanup,
- 0
-)
+ "Links", // module name
+ "4.0.0", // module version
+ "Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
+ "Links window extension",
+ links_module_init,
+ links_module_can_unload,
+ 0,
+ links_module_cleanup,
+ 0)