aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/options
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/options')
-rw-r--r--src/modules/options/dialog.cpp16
-rw-r--r--src/modules/options/dialog.h14
-rw-r--r--src/modules/options/optw_identity.cpp18
-rw-r--r--src/modules/options/optw_identity.h4
-rw-r--r--src/modules/options/optw_mediatypes.cpp6
-rw-r--r--src/modules/options/optw_mediatypes.h8
-rw-r--r--src/modules/options/optw_messages.h2
-rw-r--r--src/modules/options/optw_nickserv.cpp18
-rw-r--r--src/modules/options/optw_nickserv.h4
-rw-r--r--src/modules/options/optw_proxy.cpp12
-rw-r--r--src/modules/options/optw_proxy.h8
-rw-r--r--src/modules/options/optw_servers.cpp38
-rw-r--r--src/modules/options/optw_servers.h12
13 files changed, 80 insertions, 80 deletions
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index d972a66c0..fbcad8dc8 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -74,8 +74,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
}
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalTreeWidgetItem()
+KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
+:QTreeWidgetItem()
{
m_pInstanceEntry = e;
m_pOptionsWidget = 0;
@@ -84,8 +84,8 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviO
parent->insertTopLevelItem(0, this);
}
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalTreeWidgetItem()
+KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
+:QTreeWidgetItem()
{
m_pInstanceEntry = e;
m_pOptionsWidget = 0;
@@ -173,7 +173,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
vbox->setMargin(3);
// Controlling list view
- m_pTreeWidget = new KviTalTreeWidget(vbox);
+ m_pTreeWidget = new QTreeWidget(vbox);
m_pTreeWidget->header()->hide();
m_pTreeWidget->setRootIsDecorated(true);
@@ -476,7 +476,7 @@ void KviOptionsDialog::searchClicked()
search(szTxt);
}
-void KviOptionsDialog::fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
{
if(!l)return;
@@ -534,12 +534,12 @@ void KviOptionsDialog::fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<Kv
}
}
-void KviOptionsDialog::treeWidgetItemSelectionChanged(KviTalTreeWidgetItem* it, KviTalTreeWidgetItem *)
+void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
{
if(it)
{
QString str = it->text(0);
- KviTalTreeWidgetItem * par = it->parent();
+ QTreeWidgetItem * par = it->parent();
while(par)
{
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 719a9ecd4..b9c173db6 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -28,7 +28,7 @@
#include "instances.h"
#include "kvi_optionswidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include <QDialog>
#include <QStringList>
@@ -49,11 +49,11 @@ public:
~KviGeneralOptionsFrontWidget();
};
-class KviOptionsTreeWidgetItem : public KviTalTreeWidgetItem
+class KviOptionsTreeWidgetItem : public QTreeWidgetItem
{
public:
- KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviOptionsWidgetInstanceEntry * e);
- KviOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e);
+ KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e);
+ KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e);
~KviOptionsTreeWidgetItem();
public:
KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
@@ -67,7 +67,7 @@ public:
KviOptionsDialog(QWidget * par,const QString &szGroup);
~KviOptionsDialog();
private:
- KviTalTreeWidget * m_pTreeWidget;
+ QTreeWidget * m_pTreeWidget;
QLabel * m_pCategoryLabel;
QStackedWidget * m_pWidgetStack;
KviGeneralOptionsFrontWidget * m_pFrontWidget;
@@ -76,8 +76,8 @@ private:
QToolButton * m_pSearchButton;
private:
void recursiveCommit(KviOptionsTreeWidgetItem *it);
- void fillTreeWidget(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
- //KviOptionsTreeWidgetItem * showHiddenChildren(KviTalTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
+ void fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly = false);
+ //KviOptionsTreeWidgetItem * showHiddenChildren(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l);
//KviOptionsTreeWidgetItem * findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage);
private slots:
void treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *prev);
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index b567ffe31..f4d21fd7a 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -39,7 +39,7 @@
#include "kvi_identityprofile.h"
#include "kvi_tal_tooltip.h"
#include "kvi_tal_hbox.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include <QCheckBox>
#include <QLineEdit>
@@ -685,7 +685,7 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare
connect(m_pProfilesCheck,SIGNAL(toggled(bool)),this,SLOT(toggleControls()));
// Profiles list
- m_pTreeWidget = new KviTalTreeWidget(this);
+ m_pTreeWidget = new QTreeWidget(this);
m_pTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
m_pTreeWidget->setAllColumnsShowFocus(true);
@@ -724,11 +724,11 @@ KviIdentityProfileOptionsWidget::KviIdentityProfileOptionsWidget(QWidget * pPare
// Fill in the treewidget
if(pSet && pSet->profiles())
{
- KviTalTreeWidgetItem * pItem;
+ QTreeWidgetItem * pItem;
KviPointerList<KviIdentityProfile> * pList = pSet->profiles();
for(KviIdentityProfile * pProfile = pList->first(); pProfile; pProfile = pList->next())
{
- pItem = new KviTalTreeWidgetItem(m_pTreeWidget);
+ pItem = new QTreeWidgetItem(m_pTreeWidget);
pItem->setText(0,pProfile->name());
pItem->setText(1,pProfile->network());
pItem->setText(2,pProfile->nick());
@@ -763,7 +763,7 @@ void KviIdentityProfileOptionsWidget::addProfileEntry()
if(editor.editProfile(&profile))
{
- KviTalTreeWidgetItem * pItem = new KviTalTreeWidgetItem(m_pTreeWidget);
+ QTreeWidgetItem * pItem = new QTreeWidgetItem(m_pTreeWidget);
pItem->setText(0,profile.name());
pItem->setText(1,profile.network());
pItem->setText(2,profile.nick());
@@ -775,7 +775,7 @@ void KviIdentityProfileOptionsWidget::addProfileEntry()
void KviIdentityProfileOptionsWidget::editProfileEntry()
{
- KviTalTreeWidgetItem * pItem = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem();
+ QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
if(!pItem)
return;
@@ -802,7 +802,7 @@ void KviIdentityProfileOptionsWidget::editProfileEntry()
void KviIdentityProfileOptionsWidget::delProfileEntry()
{
- KviTalTreeWidgetItem * pItem = (KviTalTreeWidgetItem *)m_pTreeWidget->currentItem();
+ QTreeWidgetItem * pItem = (QTreeWidgetItem *)m_pTreeWidget->currentItem();
if(!pItem)
return;
@@ -816,10 +816,10 @@ void KviIdentityProfileOptionsWidget::commit()
if(m_pTreeWidget->topLevelItemCount())
{
KviIdentityProfileSet::instance()->setEnabled(m_pProfilesCheck->isChecked());
- KviTalTreeWidgetItem * pItem;
+ QTreeWidgetItem * pItem;
for(int i=0; i < m_pTreeWidget->topLevelItemCount(); i++)
{
- pItem = (KviTalTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+ pItem = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
KviIdentityProfile * pProfile = new KviIdentityProfile();
pProfile->setName(pItem->text(0));
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 47650c9f7..e83bb635d 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -39,7 +39,7 @@ class QLineEdit;
class QPushButton;
class QComboBox;
class KviHttpRequest;
-class KviTalTreeWidget;
+class QTreeWidget;
class KviIdentityProfile;
class KviNickAlternativesDialog : public QDialog
@@ -236,7 +236,7 @@ public:
KviIdentityProfileOptionsWidget(QWidget * pParent);
~KviIdentityProfileOptionsWidget();
protected:
- KviTalTreeWidget * m_pTreeWidget;
+ QTreeWidget * m_pTreeWidget;
QCheckBox * m_pProfilesCheck;
QPushButton * m_pBtnAddProfile;
QPushButton * m_pBtnEditProfile;
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 149c7d317..a095364e4 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -46,8 +46,8 @@ static void copyMediaType(KviMediaType * dst,const KviMediaType * src)
dst->szIcon = src->szIcon;
}
-KviMediaTypeTreeWidgetItem::KviMediaTypeTreeWidgetItem(KviTalTreeWidget * w,KviMediaType * t)
-: KviTalTreeWidgetItem(w)
+KviMediaTypeTreeWidgetItem::KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t)
+: QTreeWidgetItem(w)
{
copyData(t);
}
@@ -71,7 +71,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
createLayout();
- m_pTreeWidget = new KviTalTreeWidget(this);
+ m_pTreeWidget = new QTreeWidget(this);
m_pTreeWidget->setColumnCount(3);
QStringList columnLabels;
columnLabels.append(__tr2qs_ctx("Pattern","options"));
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 88f7a38d0..85448e617 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -26,16 +26,16 @@
#include "kvi_optionswidget.h"
#include "kvi_mediatype.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include <QLineEdit>
#include <QPushButton>
-class KviMediaTypeTreeWidgetItem : public KviTalTreeWidgetItem
+class KviMediaTypeTreeWidgetItem : public QTreeWidgetItem
{
public:
- KviMediaTypeTreeWidgetItem(KviTalTreeWidget * w,KviMediaType * t);
+ KviMediaTypeTreeWidgetItem(QTreeWidget * w,KviMediaType * t);
~KviMediaTypeTreeWidgetItem();
private:
KviMediaType m_data;
@@ -58,7 +58,7 @@ public:
KviMediaTypesOptionsWidget(QWidget * parent);
~KviMediaTypesOptionsWidget();
private:
- KviTalTreeWidget * m_pTreeWidget;
+ QTreeWidget * m_pTreeWidget;
QLineEdit * m_pDescription;
QLineEdit * m_pIanaType;
QLineEdit * m_pFileMask;
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index ac237733b..352d1f9cd 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -26,7 +26,7 @@
#include "kvi_optionswidget.h"
#include "kvi_msgtype.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include "kvi_tal_listwidget.h"
#include "kvi_tal_popupmenu.h"
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index dfa6b7994..88e504f98 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -30,7 +30,7 @@
#include "kvi_nickserv.h"
#include "kvi_ircmask.h"
#include "kvi_tal_tooltip.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include <QLayout>
#include <QLineEdit>
@@ -235,7 +235,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
KviTalToolTip::add(m_pNickServCheck,__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
m_pNickServCheck->setChecked(bNickServEnabled);
- m_pNickServTreeWidget = new KviTalTreeWidget(this);
+ m_pNickServTreeWidget = new QTreeWidget(this);
m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
m_pNickServTreeWidget->setAllColumnsShowFocus(true);
QStringList columnLabels;
@@ -277,11 +277,11 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
if(rs && rs->rules())
{
- KviTalTreeWidgetItem *it;
+ QTreeWidgetItem *it;
KviPointerList<KviNickServRule> * ll = rs->rules();
for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
{
- it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+ it = new QTreeWidgetItem(m_pNickServTreeWidget);
it->setText(0,rule->registeredNick());
it->setText(1,rule->serverMask());
it->setText(2,rule->nickServMask());
@@ -301,7 +301,7 @@ KviNickServOptionsWidget::~KviNickServOptionsWidget()
void KviNickServOptionsWidget::editNickServRule()
{
- KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
+ QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
if(!it)return;
KviNickServRule r(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1));
KviNickServRuleEditor ed(this,true);
@@ -321,7 +321,7 @@ void KviNickServOptionsWidget::addNickServRule()
KviNickServRuleEditor ed(this,true);
if(ed.editRule(&r))
{
- KviTalTreeWidgetItem* it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+ QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget);
it->setText(0,r.registeredNick());
it->setText(1,r.serverMask());
it->setText(2,r.nickServMask());
@@ -332,7 +332,7 @@ void KviNickServOptionsWidget::addNickServRule()
void KviNickServOptionsWidget::delNickServRule()
{
- KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
+ QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
if(!it)return;
delete it;
enableDisableNickServControls();
@@ -354,11 +354,11 @@ void KviNickServOptionsWidget::commit()
if(m_pNickServTreeWidget->topLevelItemCount())
{
g_pNickServRuleSet->setEnabled(m_pNickServCheck->isChecked());
- KviTalTreeWidgetItem * it;// = m_pNickServTreeWidget->firstChild();
+ QTreeWidgetItem * it;// = m_pNickServTreeWidget->firstChild();
for (int i=0;i<m_pNickServTreeWidget->topLevelItemCount();i++)
// while(it)
{
- it=(KviTalTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i);
+ it=(QTreeWidgetItem *)m_pNickServTreeWidget->topLevelItem(i);
g_pNickServRuleSet->addRule(KviNickServRule::createInstance(it->text(0),it->text(2),it->text(3),it->text(4),it->text(1)));
//it = it->nextSibling();
}
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 5764652f0..0d7f82558 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -35,7 +35,7 @@
class QLineEdit;
class QPushButton;
class KviNickServRule;
-class KviTalTreeWidget;
+class QTreeWidget;
#define KVI_OPTIONS_WIDGET_ICON_KviNickServOptionsWidget KVI_SMALLICON_NICKSERV
#define KVI_OPTIONS_WIDGET_NAME_KviNickServOptionsWidget __tr2qs_no_lookup("NickServ")
@@ -72,7 +72,7 @@ public:
KviNickServOptionsWidget(QWidget * parent);
~KviNickServOptionsWidget();
protected:
- KviTalTreeWidget * m_pNickServTreeWidget;
+ QTreeWidget * m_pNickServTreeWidget;
QCheckBox * m_pNickServCheck;
QPushButton * m_pAddRuleButton;
QPushButton * m_pDelRuleButton;
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index bc7da652b..91a8dc33e 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -43,8 +43,8 @@
#include <QToolButton>
-KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
-: KviTalTreeWidgetItem(parent)
+KviProxyOptionsTreeWidgetItem::KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx)
+: QTreeWidgetItem(parent)
{
debug("Creating item");
setText(0,prx->m_szHostname);
@@ -65,7 +65,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
addBoolSelector(0,0,1,0,__tr2qs_ctx("Use proxy","options"),KviOption_boolUseProxyHost);
- m_pTreeWidget = new KviTalTreeWidget(this);
+ m_pTreeWidget = new QTreeWidget(this);
addWidgetToLayout(m_pTreeWidget,0,1,0,1);
m_pTreeWidget->setHeaderLabel(__tr2qs_ctx("Proxy","options"));
m_pTreeWidget->setRootIsDecorated(true);
@@ -320,7 +320,7 @@ void KviProxyOptionsWidget::commit()
void KviProxyOptionsWidget::customContextMenuRequested(const QPoint &pos)
{
- KviTalTreeWidgetItem *it=(KviTalTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
+ QTreeWidgetItem *it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
m_pContextPopup->clear();
m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,SLOT(newProxy()));
m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,SLOT(removeCurrent())),it);
@@ -343,11 +343,11 @@ void KviProxyOptionsWidget::removeCurrent()
//delete m_pLastEditedItem;
//m_pLastEditedItem = 0;
- KviTalTreeWidgetItem * tmp = m_pLastEditedItem;
+ QTreeWidgetItem * tmp = m_pLastEditedItem;
m_pLastEditedItem = 0;
delete tmp;
- KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
+ QTreeWidgetItem * it = (QTreeWidgetItem *)m_pTreeWidget->topLevelItem(0);
if(it)
{
it->setSelected(true);
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index 3b84ff44c..5875676a9 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -25,7 +25,7 @@
//=============================================================================
#include "kvi_optionswidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include <QCheckBox>
@@ -39,10 +39,10 @@ class KviProxyDataBase;
extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
-class KviProxyOptionsTreeWidgetItem : public KviTalTreeWidgetItem
+class KviProxyOptionsTreeWidgetItem : public QTreeWidgetItem
{
public:
- KviProxyOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
+ KviProxyOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,KviProxy * prx);
~KviProxyOptionsTreeWidgetItem();
public:
KviProxy * m_pProxyData;
@@ -62,7 +62,7 @@ public:
KviProxyOptionsWidget(QWidget * parent);
~KviProxyOptionsWidget();
protected:
- KviTalTreeWidget * m_pTreeWidget;
+ QTreeWidget * m_pTreeWidget;
QLabel * m_pProxyLabel;
QLineEdit * m_pProxyEdit;
QLabel * m_pIpLabel;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index bbf672ac7..7ee6db4ed 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -283,7 +283,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
__tr2qs_ctx("This check enables the automatic identification with NickServ","options"));
m_pNickServCheck->setChecked(bNickServEnabled);
- m_pNickServTreeWidget = new KviTalTreeWidget(tab);
+ m_pNickServTreeWidget = new QTreeWidget(tab);
m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection);
m_pNickServTreeWidget->setAllColumnsShowFocus(true);
m_pNickServTreeWidget->setColumnCount(4);
@@ -324,7 +324,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
KviPointerList<KviNickServRule> * ll = rs->rules();
for(KviNickServRule * rule = ll->first();rule;rule = ll->next())
{
- KviTalTreeWidgetItem* it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+ QTreeWidgetItem* it = new QTreeWidgetItem(m_pNickServTreeWidget);
it->setText(0,rule->registeredNick());
it->setText(1,rule->nickServMask());
it->setText(2,rule->messageRegexp());
@@ -364,7 +364,7 @@ KviNetworkDetailsWidget::~KviNetworkDetailsWidget()
void KviNetworkDetailsWidget::editNickServRule()
{
- KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *) m_pNickServTreeWidget->currentItem();
+ QTreeWidgetItem * it = (QTreeWidgetItem *) m_pNickServTreeWidget->currentItem();
if(!it)return;
KviNickServRule r(it->text(0),it->text(1),it->text(2),it->text(3));
KviNickServRuleEditor ed(this,false);
@@ -383,7 +383,7 @@ void KviNetworkDetailsWidget::addNickServRule()
KviNickServRuleEditor ed(this,false);
if(ed.editRule(&r))
{
- KviTalTreeWidgetItem *it = new KviTalTreeWidgetItem(m_pNickServTreeWidget);
+ QTreeWidgetItem *it = new QTreeWidgetItem(m_pNickServTreeWidget);
it->setText(0,r.registeredNick());
it->setText(1,r.nickServMask());
it->setText(2,r.messageRegexp());
@@ -393,7 +393,7 @@ void KviNetworkDetailsWidget::addNickServRule()
void KviNetworkDetailsWidget::delNickServRule()
{
- KviTalTreeWidgetItem * it = (KviTalTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
+ QTreeWidgetItem * it = (QTreeWidgetItem *)m_pNickServTreeWidget->currentItem();
if(!it)return;
delete it;
enableDisableNickServControls();
@@ -448,10 +448,10 @@ void KviNetworkDetailsWidget::fillData(KviNetwork * n)
{
KviNickServRuleSet * rs = KviNickServRuleSet::createInstance();
rs->setEnabled(m_pNickServCheck->isChecked());
- KviTalTreeWidgetItem * it;
+ QTreeWidgetItem * it;
for (int i=0;i<m_pNickServTreeWidget->topLevelItemCount();i++)
{
- it=(KviTalTreeWidgetItem *) m_pNickServTreeWidget->topLevelItem(i);
+ it=(QTreeWidgetItem *) m_pNickServTreeWidget->topLevelItem(i);
rs->addRule(KviNickServRule::createInstance(it->text(0),it->text(1),it->text(2),it->text(3)));
}
n->setNickServRuleSet(rs);
@@ -1019,8 +1019,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
// kvi_app.cpp
extern KVIRC_API KviServerDataBase * g_pServerDataBase;
-KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n)
- : KviTalTreeWidgetItem(parent)
+KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n)
+ : QTreeWidgetItem(parent)
{
setIcon(0,QIcon(pm));
m_pServerData = 0;
@@ -1029,8 +1029,8 @@ KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget
setText(1,n->description());
}
-KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s)
- : KviTalTreeWidgetItem(parent)
+KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s)
+ : QTreeWidgetItem(parent)
{
setIcon(0,QIcon(pm));
m_pServerData = new KviServer(*s);
@@ -1078,7 +1078,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
m_pNetworkDetailsDialog = 0;
m_pImportFilter = 0;
- m_pTreeWidget = new KviTalTreeWidget(this);
+ m_pTreeWidget = new QTreeWidget(this);
addWidgetToLayout(m_pTreeWidget,0,0,0,0);
m_pTreeWidget->setColumnCount(2);
m_pTreeWidget->setMinimumWidth(500);
@@ -1257,17 +1257,17 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id)
kvi_u32_t uPort = port.toUInt(&bOk);
// we have the port too
- KviTalTreeWidgetItem * pFoundNet = 0;
- KviTalTreeWidgetItem * pFoundSrv = 0;
+ QTreeWidgetItem * pFoundNet = 0;
+ QTreeWidgetItem * pFoundSrv = 0;
- KviTalTreeWidgetItem * net;
+ QTreeWidgetItem * net;
for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
{
- net=(KviTalTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
- KviTalTreeWidgetItem * srv;
+ net=(QTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
+ QTreeWidgetItem * srv;
for (int j=0;j<net->childCount();j++)
{
- srv=(KviTalTreeWidgetItem *)net->child(i);
+ srv=(QTreeWidgetItem *)net->child(i);
KviStr tmp = ((KviServerOptionsTreeWidgetItem *)srv)->m_pServerData->hostName();
if(kvi_strEqualCI(tmp.ptr(),data.ptr()))
{
@@ -1458,7 +1458,7 @@ void KviServerOptionsWidget::commit()
void KviServerOptionsWidget::customContextMenuRequested(const QPoint &pnt)
{
int id;
- KviTalTreeWidgetItem *it=(KviTalTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
+ QTreeWidgetItem *it=(QTreeWidgetItem *) m_pTreeWidget->itemAt(pnt);
bool bServer = (it && ((KviServerOptionsTreeWidgetItem *)it)->m_pServerData);
m_pContextPopup->clear();
m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,SLOT(newNetwork()));
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 331f52343..9ba0046d4 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -26,7 +26,7 @@
//=============================================================================
#include "kvi_optionswidget.h"
-#include "kvi_tal_treewidget.h"
+#include <QTreeWidget>
#include <QDialog>
#include <QButtonGroup>
@@ -50,11 +50,11 @@ class KviNetworkData;
class KviMexServerImport;
-class KviServerOptionsTreeWidgetItem : public KviTalTreeWidgetItem
+class KviServerOptionsTreeWidgetItem : public QTreeWidgetItem
{
public:
- KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n);
- KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s);
+ KviServerOptionsTreeWidgetItem(QTreeWidget *parent,const QPixmap &pm,const KviNetwork *n);
+ KviServerOptionsTreeWidgetItem(QTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s);
~KviServerOptionsTreeWidgetItem();
public:
KviServer * m_pServerData;
@@ -85,7 +85,7 @@ protected:
QCheckBox * m_pAutoConnectCheck;
- KviTalTreeWidget * m_pNickServTreeWidget;
+ QTreeWidget * m_pNickServTreeWidget;
QCheckBox * m_pNickServCheck;
QPushButton * m_pAddRuleButton;
QPushButton * m_pDelRuleButton;
@@ -160,7 +160,7 @@ public:
KviServerOptionsWidget(QWidget * parent);
~KviServerOptionsWidget();
protected:
- KviTalTreeWidget * m_pTreeWidget;
+ QTreeWidget * m_pTreeWidget;
QLabel * m_pSrvNetLabel;
QLineEdit * m_pSrvNetEdit;
//QLabel * m_pPortLabel;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 07:54:49 +0000