diff options
| author |  Fabio Bas | 2010-09-12 21:15:53 +0000 |
|---|---|---|
| committer | Fabio Bas | 2010-09-12 21:15:53 +0000 |
| commit | 455c1aa51b6d6a01ac63d6e6cce0d19d1459b5e1 (patch) | |
| tree | 88cdca4824118ec632f60c05bf7853540f5b93cc /src/modules | |
| parent | fixed typos; (diff) | |
| download | KVIrc-455c1aa51b6d6a01ac63d6e6cce0d19d1459b5e1.tar.gz KVIrc-455c1aa51b6d6a01ac63d6e6cce0d19d1459b5e1.tar.bz2 KVIrc-455c1aa51b6d6a01ac63d6e6cce0d19d1459b5e1.zip | |
fix for #950
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5001 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/aliaseditor/aliaseditor.cpp | 6 | ||||
| -rw-r--r-- | src/modules/aliaseditor/aliaseditor.h | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index c23ac16c1..db035890d 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -198,11 +198,15 @@ QString KviAliasEditor::buildFullItemName(KviAliasEditorTreeWidgetItem * it) return szName; } +//FIXME this should be called something like "findNamespace" KviAliasEditorTreeWidgetItem * KviAliasEditor::findTopLevelItem(const QString &szName) { + KviAliasEditorTreeWidgetItem *pItem =0; for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++) { - if (m_pTreeWidget->topLevelItem(i)->text(0)==szName) return (KviAliasEditorTreeWidgetItem*)m_pTreeWidget->topLevelItem(i); + pItem = (KviAliasEditorTreeWidgetItem*) m_pTreeWidget->topLevelItem(i); + if (pItem->text(0)==szName && pItem->isNamespace()) + return (KviAliasEditorTreeWidgetItem*)m_pTreeWidget->topLevelItem(i); } return 0; } diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h index c93fb1f7f..c6a529e23 100644 --- a/src/modules/aliaseditor/aliaseditor.h +++ b/src/modules/aliaseditor/aliaseditor.h @@ -58,17 +58,17 @@ protected: QString m_szBuffer; int m_cPos; public: - const QString & name(){ return m_szName; }; + inline const QString & name(){ return m_szName; }; void setName(const QString &szName); - Type type(){ return m_eType; }; + inline Type type(){ return m_eType; }; void setType(Type t); - bool isAlias(){ return m_eType == Alias; }; - bool isNamespace(){ return m_eType == Namespace; }; + inline bool isAlias(){ return m_eType == Alias; }; + inline bool isNamespace(){ return m_eType == Namespace; }; void setParentItem(KviAliasEditorTreeWidgetItem* it){ m_pParentItem=it; }; KviAliasEditorTreeWidgetItem * parentItem(){ return m_pParentItem; }; - void setBuffer(const QString &szBuffer){ m_szBuffer = szBuffer; }; - const QString & buffer(){ return m_szBuffer; }; - const int & cursorPosition(){return m_cPos; }; + inline void setBuffer(const QString &szBuffer){ m_szBuffer = szBuffer; }; + inline const QString & buffer(){ return m_szBuffer; }; + inline const int & cursorPosition(){return m_cPos; }; void setCursorPosition(const int &cPos){ m_cPos = cPos; }; }; @@ -151,7 +151,7 @@ protected: QString askForAliasName(const QString &szAction,const QString &szText,const QString &szInitialText); QString askForNamespaceName(const QString &szAction,const QString &szText,const QString &szInitialText); - +// bool itemExists(QTreeWidgetItem *pSearchFor); bool namespaceExists(QString &szFullItemName); bool aliasExists(QString &szFullItemName); |