The big rename for modules. Still some details remaining.

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

1 files changed, 47 insertions, 47 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 9e323587a..e80cab7a6 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -53,12 +53,12 @@
 
 
 //extern KviModule * g_pOptionsModule;
-extern KviPointerHashTable<QString,KviOptionsDialog> * g_pOptionsDialogDict;
+extern KviPointerHashTable<QString,OptionsDialog> * g_pOptionsDialogDict;
 
 extern KVIRC_API KviApplication * g_pApp;
-extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
+extern OptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
+OptionsDialogFrontWidget::OptionsDialogFrontWidget(QWidget *parent,const QString &szText)
 :KviOptionsWidget(parent)
 {
 	setObjectName("general_options_front_widget");
@@ -69,12 +69,12 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const
 	layout()->addWidget(l,0,0);
 }
 
-KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
+OptionsDialogFrontWidget::~OptionsDialogFrontWidget()
 {
 }
 
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
+OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidget *parent,OptionsWidgetInstanceEntry * e)
 :QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
@@ -84,7 +84,7 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidget *parent,KviOption
 	parent->insertTopLevelItem(0, this);
 }
 
-KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
+OptionsDialogTreeWidgetItem::OptionsDialogTreeWidgetItem(QTreeWidgetItem *parent,OptionsWidgetInstanceEntry * e)
 :QTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
@@ -94,11 +94,11 @@ KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(QTreeWidgetItem *parent,KviOp
 	parent->insertChild(0, this);
 }
 
-KviOptionsTreeWidgetItem::~KviOptionsTreeWidgetItem()
+OptionsDialogTreeWidgetItem::~OptionsDialogTreeWidgetItem()
 {
 }
 
-KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
+OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup)
 : QWidget(par)
 {
 	setObjectName("general_options_dialog");
@@ -219,7 +219,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	vbox->setStretchFactor(m_pWidgetStack,1);
 
 	// First widget visible
-	m_pFrontWidget = new KviGeneralOptionsFrontWidget(m_pWidgetStack,szFrontText);
+	m_pFrontWidget = new OptionsDialogFrontWidget(m_pWidgetStack,szFrontText);
 	m_pWidgetStack->addWidget(m_pFrontWidget);
 
 	int idx = m_pWidgetStack->indexOf(m_pFrontWidget);
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	new QShortcut(Qt::Key_Escape,this,SLOT(close()));
 }
 
-KviOptionsDialog::~KviOptionsDialog()
+OptionsDialog::~OptionsDialog()
 {
 	if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = QRect(pos().x(),pos().y(),
 			size().width(),size().height());
@@ -280,7 +280,7 @@ KviOptionsDialog::~KviOptionsDialog()
 		g_pOptionsDialogDict->remove(m_szGroup);
 }
 
-void KviOptionsDialog::showEvent(QShowEvent *e)
+void OptionsDialog::showEvent(QShowEvent *e)
 {
 	QRect r = g_pApp->desktop()->screenGeometry(g_pApp->desktop()->primaryScreen());
 
@@ -303,12 +303,12 @@ void KviOptionsDialog::showEvent(QShowEvent *e)
 	QWidget::showEvent(e);
 }
 
-void KviOptionsDialog::searchLineEditTextChanged(const QString &)
+void OptionsDialog::searchLineEditTextChanged(const QString &)
 {
 	QString txt = m_pSearchLineEdit->text().trimmed();
 	m_pSearchButton->setEnabled(txt.length() > 0);
 }
-bool KviOptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords)
+bool OptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const QStringList &lKeywords)
 {
 	KviPointerList<KviSelectorInterface> *selectors=pOptionsWidget->selectors();
 	bool bFoundSomethingHere=false;
@@ -347,7 +347,7 @@ bool KviOptionsDialog::searchInSelectors(KviOptionsWidget *pOptionsWidget,const
 	return bFoundSomethingHere;
 }
 
-bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QStringList &lKeywords)
+bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QStringList &lKeywords)
 {
 	if(!pItem)return false;
 	if(!pItem->m_pOptionsWidget)
@@ -399,7 +399,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QS
 	{
 		for(int j=0;j<ccount;j++)
 		{
-			KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)pItem->child(j);
+			OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
 			bool bRet = recursiveSearch(pChild,lKeywords);
 			if(bRet)bFoundSomethingInside = true;
 		}
@@ -410,41 +410,41 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsTreeWidgetItem * pItem,const QS
 	return (bFoundSomethingInside || bFoundSomethingHere);
 }
 
-void KviOptionsDialog::search(const QStringList &lKeywords)
+void OptionsDialog::search(const QStringList &lKeywords)
 {
 	m_pTreeWidget->setUpdatesEnabled(false);
 
 	int count=m_pTreeWidget->topLevelItemCount();
 	for (int i=0;i<count;i++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		recursiveSearch(pChild,lKeywords);
 	}
 	m_pTreeWidget->setUpdatesEnabled(true);
 	m_pTreeWidget->update();
 }
 
-void KviOptionsDialog::search(const QString &szKeywords)
+void OptionsDialog::search(const QString &szKeywords)
 {
 	QStringList lKeywords = szKeywords.split(" ",QString::SkipEmptyParts);
 	search(lKeywords);
 }
 
-void KviOptionsDialog::searchClicked()
+void OptionsDialog::searchClicked()
 {
 	QString szTxt = m_pSearchLineEdit->text().trimmed();
 	if(!szTxt.isEmpty())
 		search(szTxt);
 }
 
-void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
+void OptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<OptionsWidgetInstanceEntry> * l,const QString &szGroup,bool bNotContainedOnly)
 {
 	if(!l)return;
 
-	KviOptionsTreeWidgetItem * it;
-	KviOptionsWidgetInstanceEntry * e;
+	OptionsDialogTreeWidgetItem * it;
+	OptionsWidgetInstanceEntry * e;
 
-	KviPointerList<KviOptionsWidgetInstanceEntry> tmp;
+	KviPointerList<OptionsWidgetInstanceEntry> tmp;
 	tmp.setAutoDelete(false);
 
 
@@ -453,7 +453,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 		// must be in the correct group
 		// if we want only containers then well.. must be one
 		e->bDoInsert = KviQString::equalCI(szGroup,e->szGroup) && ((!bNotContainedOnly) || e->bIsContainer || e->bIsNotContained);
-		KviOptionsWidgetInstanceEntry * ee = tmp.first();
+		OptionsWidgetInstanceEntry * ee = tmp.first();
 		int idx = 0;
 		while(ee)
 		{
@@ -468,8 +468,8 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 	{
 		if(e->bDoInsert)
 		{
-			if(p)it = new KviOptionsTreeWidgetItem(p,e);
-			else it = new KviOptionsTreeWidgetItem(m_pTreeWidget,e);
+			if(p)it = new OptionsDialogTreeWidgetItem(p,e);
+			else it = new OptionsDialogTreeWidgetItem(m_pTreeWidget,e);
 			if(!it->m_pOptionsWidget)
 			{
 				it->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(it->m_pInstanceEntry,m_pWidgetStack);
@@ -478,7 +478,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 					m_pWidgetStack->addWidget(it->m_pOptionsWidget);
 			}
 		} else {
-			it = (KviOptionsTreeWidgetItem *)p;
+			it = (OptionsDialogTreeWidgetItem *)p;
 		}
 
 		if(e->pChildList)
@@ -495,7 +495,7 @@ void KviOptionsDialog::fillTreeWidget(QTreeWidgetItem * p,KviPointerList<KviOpti
 	}
 }
 
-void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
+void OptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTreeWidgetItem *)
 {
 	if(it)
 	{
@@ -511,7 +511,7 @@ void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTree
 		str.prepend("<b>");
 		str += "</b>";
 
-		KviOptionsTreeWidgetItem *i = (KviOptionsTreeWidgetItem *)it;
+		OptionsDialogTreeWidgetItem *i = (OptionsDialogTreeWidgetItem *)it;
 		if(!i->m_pOptionsWidget)
 		{
 			i->m_pOptionsWidget = g_pOptionsInstanceManager->getInstance(i->m_pInstanceEntry,m_pWidgetStack);
@@ -525,18 +525,18 @@ void KviOptionsDialog::treeWidgetItemSelectionChanged(QTreeWidgetItem* it, QTree
 }
 
 /*
-KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidgetItem *it,KviOptionsWidget * pPage)
+OptionsDialogTreeWidgetItem * OptionsDialog::findItemByPage(OptionsDialogTreeWidgetItem *it,KviOptionsWidget * pPage)
 {
 	if(!it)return 0;
 	if(it->m_pOptionsWidget == pPage)return it;
 
-	KviOptionsTreeWidgetItem *i;
+	OptionsDialogTreeWidgetItem *i;
 
 	int ccount = it->childCount();
 
 	for(int j=0;j<ccount;j++)
 	{
-		KviOptionsTreeWidgetItem * i = (KviOptionsTreeWidgetItem *)it->child(j);
+		OptionsDialogTreeWidgetItem * i = (OptionsDialogTreeWidgetItem *)it->child(j);
 
 		i = findItemByPage(i,pPage);
 		if(i)return i;
@@ -545,13 +545,13 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
 	// not found in the children tree.. look in the next sibling
 	for(int j=0;j<ccount;j++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)pItem->child(j);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)pItem->child(j);
 
 		i = findItemByPage(i,pPage);
 		if(i)return i;
 	}
 
-	i = (KviOptionsTreeWidgetItem *)(it->nextSibling());
+	i = (OptionsDialogTreeWidgetItem *)(it->nextSibling());
 	if(i)
 	{
 		i = findItemByPage(i,pPage);
@@ -560,26 +560,26 @@ KviOptionsTreeWidgetItem * KviOptionsDialog::findItemByPage(KviOptionsTreeWidget
 	return 0;
 }
 */
-void KviOptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
+void OptionsDialog::pageWantsToSwitchToAdvancedPage(KviOptionsWidget *)
 {
 	// unused
 }
 
-void KviOptionsDialog::applyClicked()
+void OptionsDialog::applyClicked()
 {
 	apply(false);
 }
 
-void KviOptionsDialog::apply(bool bDialogAboutToClose)
+void OptionsDialog::apply(bool bDialogAboutToClose)
 {
 	int count=m_pTreeWidget->topLevelItemCount();
 	int curTab=-1;
-	KviOptionsTreeWidgetItem * it;
+	OptionsDialogTreeWidgetItem * it;
 
 	if(!bDialogAboutToClose)
 	{
 		// bring up the current widget again!
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		//checking if the check of the check is checkable
 		if(it)
 			if(it->m_pOptionsWidget)
@@ -589,14 +589,14 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 
 	for (int i=0;i<count;i++)
 	{
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 		recursiveCommit(it);
 	}
 
 	if(!bDialogAboutToClose)
 	{
 		// bring up the current widget again!
-		it = (KviOptionsTreeWidgetItem *)m_pTreeWidget->currentItem();
+		it = (OptionsDialogTreeWidgetItem *)m_pTreeWidget->currentItem();
 		if(it)
 		{
 			treeWidgetItemSelectionChanged(it, 0);
@@ -610,31 +610,31 @@ void KviOptionsDialog::apply(bool bDialogAboutToClose)
 
 }
 
-void KviOptionsDialog::okClicked()
+void OptionsDialog::okClicked()
 {
 	apply(true);
 	deleteLater();
 }
 
-void KviOptionsDialog::cancelClicked()
+void OptionsDialog::cancelClicked()
 {
 	deleteLater();
 }
 
-void KviOptionsDialog::closeEvent(QCloseEvent *e)
+void OptionsDialog::closeEvent(QCloseEvent *e)
 {
 	e->ignore();
 	deleteLater();
 }
 
-void KviOptionsDialog::recursiveCommit(KviOptionsTreeWidgetItem *it)
+void OptionsDialog::recursiveCommit(OptionsDialogTreeWidgetItem *it)
 {
 	// First commit the children
 	if(!it) return;
 	int count=it->childCount();
 	for (int i=0;i<count;i++)
 	{
-		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)it->child(i);
+		OptionsDialogTreeWidgetItem * pChild = (OptionsDialogTreeWidgetItem *)it->child(i);
 		recursiveCommit(pChild);
 	}
 
@@ -648,7 +648,7 @@ void KviOptionsDialog::recursiveCommit(KviOptionsTreeWidgetItem *it)
 	//refreshTreeWidget(); // <-- this tends to jump into infinite recursion
 }
 
-void  KviOptionsDialog::keyPressEvent( QKeyEvent * e )
+void  OptionsDialog::keyPressEvent( QKeyEvent * e )
 {
 	if(e->key()==Qt::Key_Return)
 		e->accept();