diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-07-04 18:47:38 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-07-04 18:47:38 +0000 |
| commit | 15ad8b9bc075e3d0f7167267ed495a82d4c1a5a8 (patch) | |
| tree | 8a25089216f16b2a1680456d46352fe4a13e4fd4 /pokemodr/models/MapEffectModel.cpp | |
| parent | 868eedeac21b1132c26181f32a428674a4a15294 (diff) | |
| download | sigen-15ad8b9bc075e3d0f7167267ed495a82d4c1a5a8.tar.gz sigen-15ad8b9bc075e3d0f7167267ed495a82d4c1a5a8.tar.xz sigen-15ad8b9bc075e3d0f7167267ed495a82d4c1a5a8.zip | |
[FIX] KMenu* can now be put into a QVariant
[FIX] ScriptWidget now uses a more explicit choice (real name rather than internal name)
[FIX] KateView shortcuts dont collide (but don't work either)
[FIX] Hat and Matrix no longer inlined all the time
[FIX] Building out of source now works
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@223 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokemodr/models/MapEffectModel.cpp')
| -rw-r--r-- | pokemodr/models/MapEffectModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pokemodr/models/MapEffectModel.cpp b/pokemodr/models/MapEffectModel.cpp index 13097991..9603bf3a 100644 --- a/pokemodr/models/MapEffectModel.cpp +++ b/pokemodr/models/MapEffectModel.cpp @@ -62,7 +62,7 @@ QVariant Pokemodr::MapEffectModel::data(int role) const { KMenu* menu = new KMenu; menu->addAction("&Delete Effect", this, SLOT(deleteSelf())); - return QVariant::fromValue(static_cast<void*>(menu)); + return QVariant::fromValue(menu); } return Pokemodr::ObjectModel::data(role); } |