aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2012-07-04 23:59:00 +0000
committerGravatar Szymon Tomasz Stefanek2012-07-04 23:59:00 +0000
commit50c9cdbbafa76d06e6478025d69de00acaecc9ac (patch)
tree8ddbc7e630dce1ece47d4e162cda8f81c1c555a1 /src
parentUpdate Russian translation. (diff)
downloadKVIrc-50c9cdbbafa76d06e6478025d69de00acaecc9ac.tar.gz
KVIrc-50c9cdbbafa76d06e6478025d69de00acaecc9ac.tar.bz2
KVIrc-50c9cdbbafa76d06e6478025d69de00acaecc9ac.zip
Don't loose popup names when exporting them.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6219 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/kvs/KviKvsPopupMenu.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index 75adf369e..a14ff2697 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -402,7 +402,7 @@ KviKvsPopupMenuItemMenu::~KviKvsPopupMenuItemMenu()
KviKvsPopupMenuItem * KviKvsPopupMenuItemMenu::clone() const
{
- KviKvsPopupMenu * copy = new KviKvsPopupMenu(m_pMenu->objectName().toLatin1());
+ KviKvsPopupMenu * copy = new KviKvsPopupMenu(m_pMenu->popupName());
copy->copyFrom(m_pMenu);
return new KviKvsPopupMenuItemMenu(m_szItemName,copy,m_pKvsText,m_pKvsIcon,m_pKvsCondition);
}
@@ -571,7 +571,6 @@ void KviKvsPopupMenu::copyFrom(const KviKvsPopupMenu * src)
m_pPrologues->append(new KviKvsScript(*sp));
}
-
for(const KviKvsPopupMenuItem * it = src->m_pItemList->first();it;it = src->m_pItemList->next())
{
addItemInternal(it->clone());
@@ -1244,7 +1243,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
void KviKvsPopupMenu::generateDefPopup(QString &buffer)
{
- buffer = QString("defpopup(%1)\n").arg(objectName());
+ buffer = QString("defpopup(%1)\n").arg(m_szName);
QString core;
generateDefPopupCore(core);