summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-10 03:29:39 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-10 03:29:39 +0300
commit1d3118ec21f537695dc0e6a9608acd67396d0a51 (patch)
tree5cf9229b2d23f2a7a584b5fed9aaead306df6496 /src/gui
parentdd996d01676d7dca3eec442b14c4966ba0bb0935 (diff)
downloadmanaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.tar.gz
manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.tar.bz2
manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.tar.xz
manaplus-1d3118ec21f537695dc0e6a9608acd67396d0a51.zip
Delete copy constructor from other classes.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/botcheckerwindow.cpp2
-rw-r--r--src/gui/charselectdialog.cpp4
-rw-r--r--src/gui/chatwindow.cpp2
-rw-r--r--src/gui/gui.cpp2
-rw-r--r--src/gui/itemamountwindow.cpp2
-rw-r--r--src/gui/logindialog.cpp33
-rw-r--r--src/gui/questswindow.cpp2
-rw-r--r--src/gui/setup_input.cpp2
-rw-r--r--src/gui/setup_relations.cpp2
-rw-r--r--src/gui/setup_video.cpp2
-rw-r--r--src/gui/shortcutwindow.cpp2
-rw-r--r--src/gui/skilldialog.cpp4
-rw-r--r--src/gui/socialwindow.cpp22
-rw-r--r--src/gui/specialswindow.cpp2
-rw-r--r--src/gui/statuswindow.cpp6
-rw-r--r--src/gui/textcommandeditor.cpp2
-rw-r--r--src/gui/widgets/guitable.cpp2
-rw-r--r--src/gui/worldselectdialog.cpp2
18 files changed, 82 insertions, 13 deletions
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index 63721c242..6b2e9596a 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -68,6 +68,8 @@ public:
playersUpdated();
}
+ A_DELETE_COPY(UsersTableModel);
+
virtual ~UsersTableModel()
{
freeWidgets();
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 3307f9b76..24a3f1d8a 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -78,6 +78,8 @@ class CharDeleteConfirm final : public ConfirmDialog
{
}
+ A_DELETE_COPY(CharDeleteConfirm);
+
void action(const gcn::ActionEvent &event)
{
if (event.getId() == "yes" && mMaster)
@@ -96,6 +98,8 @@ class CharacterDisplay final : public Container
public:
CharacterDisplay(CharSelectDialog *const charSelectDialog);
+ A_DELETE_COPY(CharacterDisplay);
+
void setCharacter(Net::Character *const character);
Net::Character *getCharacter() const
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 190961839..3be64f3c5 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -86,6 +86,8 @@ class ChatInput final : public TextField, public gcn::FocusListener
addFocusListener(this);
}
+ A_DELETE_COPY(ChatInput);
+
/**
* Called if the chat input loses focus. It will set itself to
* invisible as result.
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 463ba9803..9f46559e5 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -62,6 +62,8 @@ class GuiConfigListener final : public ConfigListener
mGui(g)
{}
+ A_DELETE_COPY(GuiConfigListener);
+
void optionChanged(const std::string &name)
{
if (name == "customcursor" && mGui)
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 1751f6043..cfd51f720 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -78,6 +78,8 @@ public:
}
}
+ A_DELETE_COPY(ItemsModal);
+
virtual ~ItemsModal()
{ }
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index d70e8e4df..cbdc657bb 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -59,22 +59,27 @@ const char *UPDATE_TYPE_TEXT[3] =
class UpdateTypeModel final : public gcn::ListModel
{
-public:
- virtual ~UpdateTypeModel()
- { }
+ public:
+ UpdateTypeModel()
+ { }
- virtual int getNumberOfElements()
- {
- return 3;
- }
+ A_DELETE_COPY(UpdateTypeModel);
- virtual std::string getElementAt(int i)
- {
- if (i >= getNumberOfElements() || i < 0)
- return _("???");
+ virtual ~UpdateTypeModel()
+ { }
- return gettext(UPDATE_TYPE_TEXT[i]);
- }
+ virtual int getNumberOfElements()
+ {
+ return 3;
+ }
+
+ virtual std::string getElementAt(int i)
+ {
+ if (i >= getNumberOfElements() || i < 0)
+ return _("???");
+
+ return gettext(UPDATE_TYPE_TEXT[i]);
+ }
};
class UpdateListModel final : public gcn::ListModel
@@ -86,6 +91,8 @@ class UpdateListModel final : public gcn::ListModel
{
}
+ A_DELETE_COPY(UpdateListModel);
+
virtual ~UpdateListModel()
{ }
diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp
index 3407ba891..6192ab261 100644
--- a/src/gui/questswindow.cpp
+++ b/src/gui/questswindow.cpp
@@ -80,6 +80,8 @@ class QuestsModel final : public ExtendedNamesModel
{
}
+ A_DELETE_COPY(QuestsModel);
+
virtual ~QuestsModel()
{ }
};
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 68a14f557..7891560ee 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -59,6 +59,8 @@ class KeyListModel final : public gcn::ListModel
{
}
+ A_DELETE_COPY(KeyListModel);
+
/**
* Returns the number of elements in container.
*/
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 48271f6b7..d4792f610 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -102,6 +102,8 @@ public:
playerRelationsUpdated();
}
+ A_DELETE_COPY(PlayerTableModel);
+
virtual ~PlayerTableModel()
{
freeWidgets();
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 9c6b3f064..f84500ebb 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -78,6 +78,8 @@ class ModeListModel final : public gcn::ListModel
*/
ModeListModel();
+ A_DELETE_COPY(ModeListModel);
+
/**
* Destructor.
*/
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index bc8cd5fc1..3186598cb 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -48,6 +48,8 @@ class ShortcutTab final : public Tab
setCaption(name);
}
+ A_DELETE_COPY(ShortcutTab);
+
ShortcutContainer* mContent;
};
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 78282ec46..1f8378a87 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -99,6 +99,8 @@ class SkillListBox final : public ListBox
{
}
+ A_DELETE_COPY(SkillListBox);
+
~SkillListBox()
{
delete mModel;
@@ -194,6 +196,8 @@ class SkillTab final : public Tab
setCaption(name);
}
+ A_DELETE_COPY(SkillTab);
+
~SkillTab()
{
delete mListBox;
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 1b1d0e6e8..938817b0d 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -82,6 +82,8 @@ class SortFriendsFunctor final
class SocialTab : public Tab
{
public:
+ A_DELETE_COPY(SocialTab);
+
virtual void invite() = 0;
virtual void leave() = 0;
@@ -153,6 +155,8 @@ public:
mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
}
+ A_DELETE_COPY(SocialGuildTab);
+
~SocialGuildTab()
{
delete mList;
@@ -257,6 +261,8 @@ public:
mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
}
+ A_DELETE_COPY(SocialGuildTab2);
+
~SocialGuildTab2()
{
delete mList;
@@ -317,6 +323,8 @@ public:
mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
}
+ A_DELETE_COPY(SocialPartyTab);
+
~SocialPartyTab()
{
delete mList;
@@ -404,6 +412,8 @@ public:
{
}
+ A_DELETE_COPY(BeingsListModal);
+
~BeingsListModal()
{
delete_all(mMembers);
@@ -446,6 +456,8 @@ public:
setCaption(name);
}
+ A_DELETE_COPY(SocialPlayersTab);
+
~SocialPlayersTab()
{
delete mList;
@@ -612,6 +624,8 @@ public:
setCaption(_("Nav"));
}
+ A_DELETE_COPY(SocialNavigationTab);
+
~SocialNavigationTab()
{
delete mList;
@@ -948,6 +962,8 @@ public:
setCaption(_("Atk"));
}
+ A_DELETE_COPY(SocialAttackTab);
+
~SocialAttackTab()
{
delete mList;
@@ -1004,6 +1020,8 @@ public:
setCaption(_("Pik"));
}
+ A_DELETE_COPY(SocialPickupTab);
+
~SocialPickupTab()
{
delete mList;
@@ -1060,6 +1078,8 @@ public:
setCaption(name);
}
+ A_DELETE_COPY(SocialFriendsTab);
+
~SocialFriendsTab()
{
delete mList;
@@ -1161,6 +1181,8 @@ public:
mBrowserBox->getHeight() + 8);
}
+ A_DELETE_COPY(CreatePopup);
+
void handleLink(const std::string &link, gcn::MouseEvent *event A_UNUSED)
{
if (link == "guild" && socialWindow)
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 0fed5da50..60753aa54 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -58,6 +58,8 @@ class SpecialEntry final : public Container
public:
SpecialEntry(SpecialInfo *info);
+ A_DELETE_COPY(SpecialEntry);
+
void update(int current, int needed);
protected:
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 08efc3efa..4f287f8c2 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -61,6 +61,8 @@ class AttrDisplay : public Container
UNKNOWN
};
+ A_DELETE_COPY(AttrDisplay);
+
~AttrDisplay();
virtual std::string update();
@@ -92,6 +94,8 @@ class DerDisplay final : public AttrDisplay
public:
DerDisplay(const int id, const std::string &name);
+ A_DELETE_COPY(DerDisplay);
+
virtual Type getType() const
{ return DERIVED; }
};
@@ -101,6 +105,8 @@ class ChangeDisplay final : public AttrDisplay, gcn::ActionListener
public:
ChangeDisplay(const int id, const std::string &name);
+ A_DELETE_COPY(ChangeDisplay);
+
std::string update();
virtual Type getType() const
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 79fcd17b4..2a2c2f218 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -83,6 +83,8 @@ public:
}
}
+ A_DELETE_COPY(IconsModal);
+
virtual ~IconsModal()
{ }
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 7005386b6..d00ff287b 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -45,6 +45,8 @@ public:
GuiTableActionListener(GuiTable *_table, gcn::Widget *_widget,
int _row, int _column);
+ A_DELETE_COPY(GuiTableActionListener);
+
virtual ~GuiTableActionListener();
virtual void action(const gcn::ActionEvent& actionEvent);
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 7e77ffc6d..d6e1abfb2 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -54,6 +54,8 @@ class WorldListModel final : public gcn::ListModel
{
}
+ A_DELETE_COPY(WorldListModel);
+
virtual ~WorldListModel()
{ }