From ff5e1957dd4fde40e41e4c5e4b9e04e1f36e5ef2 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Fri, 27 Mar 2009 19:23:34 +0100 Subject: Removed unnecessary parenthesis on constructors --- src/game.cpp | 22 +++++++++++----------- src/gui/changeemaildialog.cpp | 6 +++--- src/gui/changepassworddialog.cpp | 8 ++++---- src/gui/chat.cpp | 2 +- src/gui/guildwindow.cpp | 4 ++-- src/gui/itemcontainer.cpp | 2 +- src/gui/npcpostdialog.cpp | 4 ++-- src/gui/serverdialog.cpp | 4 ++-- src/gui/setup_colors.cpp | 2 +- src/gui/skilldialog.cpp | 2 +- src/gui/unregisterdialog.cpp | 2 +- src/gui/window.cpp | 2 +- src/main.cpp | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 91d8fa3a..4687ed1f 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -255,12 +255,12 @@ void createGuiWindows(Network *network) npcIntegerDialog = new NpcIntegerDialog; npcListDialog = new NpcListDialog; npcStringDialog = new NpcStringDialog; - npcPostDialog = new NpcPostDialog(); - magicDialog = new MagicDialog(); + npcPostDialog = new NpcPostDialog; + magicDialog = new MagicDialog; equipmentWindow = new EquipmentWindow(player_node->mEquipment.get()); - buddyWindow = new BuddyWindow(); - guildWindow = new GuildWindow(); - partyWindow = new PartyWindow(); + buddyWindow = new BuddyWindow; + guildWindow = new GuildWindow; + partyWindow = new PartyWindow; #else chatWindow = new ChatWindow(network); buyDialog = new BuyDialog(network); @@ -369,10 +369,10 @@ void destroyGuiWindows() #ifdef TMWSERV_SUPPORT Game::Game(): - mBeingHandler(new BeingHandler()), - mGuildHandler(new GuildHandler()), - mPartyHandler(new PartyHandler()), - mEffectHandler(new EffectHandler()), + mBeingHandler(new BeingHandler), + mGuildHandler(new GuildHandler), + mPartyHandler(new PartyHandler), + mEffectHandler(new EffectHandler), #else Game::Game(Network *network): mNetwork(network), @@ -397,7 +397,7 @@ Game::Game(Network *network): engine = new Engine; beingManager = new BeingManager; - commandHandler = new CommandHandler(); + commandHandler = new CommandHandler; #else createGuiWindows(network); engine = new Engine(network); @@ -407,7 +407,7 @@ Game::Game(Network *network): #endif floorItemManager = new FloorItemManager; - channelManager = new ChannelManager(); + channelManager = new ChannelManager; effectManager = new EffectManager; particleEngine = new Particle(NULL); diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp index 0ed95bd7..14cfb1e7 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/changeemaildialog.cpp @@ -40,14 +40,14 @@ ChangeEmailDialog::ChangeEmailDialog(Window *parent, LoginData *loginData): Window(_("Change Email Address"), true, parent), - mWrongDataNoticeListener(new WrongDataNoticeListener()), + mWrongDataNoticeListener(new WrongDataNoticeListener), mLoginData(loginData) { gcn::Label *accountLabel = new gcn::Label(strprintf(_("Account: %s"), mLoginData->username.c_str())); gcn::Label *newEmailLabel = new gcn::Label(_("Type New Email Address twice:")); - mFirstEmailField = new TextField(); - mSecondEmailField = new TextField(); + mFirstEmailField = new TextField; + mSecondEmailField = new TextField; mChangeEmailButton = new Button(_("Change Email Address"), "change_email", this); mCancelButton = new Button(_("Cancel"), "cancel", this); diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp index 7c1e5bcd..4bc97326 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/changepassworddialog.cpp @@ -41,16 +41,16 @@ ChangePasswordDialog::ChangePasswordDialog(Window *parent, LoginData *loginData): Window(_("Change Password"), true, parent), - mWrongDataNoticeListener(new WrongDataNoticeListener()), + mWrongDataNoticeListener(new WrongDataNoticeListener), mLoginData(loginData) { gcn::Label *accountLabel = new gcn::Label(strprintf(_("Account: %s"), mLoginData->username.c_str())); gcn::Label *oldPassLabel = new gcn::Label(_("Password:")); - mOldPassField = new PasswordField(); + mOldPassField = new PasswordField; gcn::Label *newPassLabel = new gcn::Label(_("Type New Password twice:")); - mFirstPassField = new PasswordField(); - mSecondPassField = new PasswordField(); + mFirstPassField = new PasswordField; + mSecondPassField = new PasswordField; mChangePassButton = new Button(_("Change Password"), "change_password", this); mCancelButton = new Button(_("Cancel"), "cancel", this); diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 48858bf6..5b07980b 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -62,7 +62,7 @@ ChatWindow::ChatWindow(Network * network): mChatInput->setActionEventId("chatinput"); mChatInput->addActionListener(this); - mChatTabs = new TabbedArea(); + mChatTabs = new TabbedArea; add(mChatTabs); add(mChatInput); diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp index fb14235b..0d48b4f3 100644 --- a/src/gui/guildwindow.cpp +++ b/src/gui/guildwindow.cpp @@ -64,7 +64,7 @@ GuildWindow::GuildWindow(): mGuildButton[1]->setEnabled(false); mGuildButton[2]->setEnabled(false); - mGuildTabs = new TabbedArea(); + mGuildTabs = new TabbedArea; place(0, 0, mGuildButton[0]); place(1, 0, mGuildButton[1]); @@ -169,7 +169,7 @@ void GuildWindow::action(const gcn::ActionEvent &event) void GuildWindow::newGuildTab(const std::string &guildName) { // Create new tab - GuildListBox *list = new GuildListBox(); + GuildListBox *list = new GuildListBox; list->setListModel(player_node->getGuild(guildName)); ScrollArea *sa = new ScrollArea(list); sa->setDimension(gcn::Rectangle(5, 5, 135, 250)); diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp index abce257d..bd180f28 100644 --- a/src/gui/itemcontainer.cpp +++ b/src/gui/itemcontainer.cpp @@ -61,7 +61,7 @@ ItemContainer::ItemContainer(Inventory *inventory, mSwapItems(false), mDescItems(false) { - mItemPopup = new ItemPopup(); + mItemPopup = new ItemPopup; setFocusable(true); ResourceManager *resman = ResourceManager::getInstance(); diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index e0133473..5c083612 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -41,7 +41,7 @@ NpcPostDialog::NpcPostDialog(): // create text field for receiver gcn::Label *senderText = new gcn::Label("To:"); senderText->setPosition(5, 5); - mSender = new TextField(); + mSender = new TextField; mSender->setPosition(senderText->getWidth() + 5, 5); mSender->setWidth(65); @@ -54,7 +54,7 @@ NpcPostDialog::NpcPostDialog(): sendButton->getY()); // create textfield for letter - mText = new TextBox(); + mText = new TextBox; mText->setHeight(400 - (mSender->getHeight() + sendButton->getHeight())); mText->setEditable(true); diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp index a57be06c..9d679acb 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/serverdialog.cpp @@ -80,7 +80,7 @@ ServerDialog::ServerDialog(LoginData *loginData): mPortField = new TextField(toString(mLoginData->port)); // Add the most used servers from config - mMostUsedServersListModel = new ServersListModel(); + mMostUsedServersListModel = new ServersListModel; Server currentServer; std::string currentConfig = ""; for (int i=0; i<=MAX_SERVERLIST; i++) @@ -101,7 +101,7 @@ ServerDialog::ServerDialog(LoginData *loginData): mMostUsedServersListBox = new ListBox(NULL); mMostUsedServersListBox->setListModel(mMostUsedServersListModel); - mMostUsedServersScrollArea = new ScrollArea(); + mMostUsedServersScrollArea = new ScrollArea; mMostUsedServersDropDown = new DropDown(mMostUsedServersListModel, mMostUsedServersScrollArea, mMostUsedServersListBox); diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index 073bbc1a..dcd0b73d 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -79,7 +79,7 @@ Setup_Colors::Setup_Colors() : mGradTypeSlider->addActionListener(this); mGradTypeSlider->setEnabled(false); - mGradTypeText = new Label(); + mGradTypeText = new Label; mRedLabel = new Label(_("Red: ")); diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp index e30299d4..16c983ad 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/skilldialog.cpp @@ -102,7 +102,7 @@ SkillDialog::SkillDialog(): setCloseButton(true); setDefaultSize(windowContainer->getWidth() - 280, 30, 275, 425); - TabbedArea *panel = new TabbedArea(); + TabbedArea *panel = new TabbedArea; panel->setDimension(gcn::Rectangle(5, 5, 270, 420)); Skill_Tab *tab; diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp index 7906afc1..c133c9f7 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/unregisterdialog.cpp @@ -42,7 +42,7 @@ UnRegisterDialog::UnRegisterDialog(Window *parent, LoginData *loginData): Window("Unregister", true, parent), - mWrongDataNoticeListener(new WrongDataNoticeListener()), + mWrongDataNoticeListener(new WrongDataNoticeListener), mLoginData(loginData) { gcn::Label *userLabel = new gcn::Label(strprintf(_("Name: %s"), mLoginData->username.c_str())); diff --git a/src/gui/window.cpp b/src/gui/window.cpp index 3bc03fb8..5dd32e00 100644 --- a/src/gui/window.cpp +++ b/src/gui/window.cpp @@ -60,7 +60,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent, const std throw GCN_EXCEPTION("Window::Window(): no windowContainer set"); if (instances == 0) - skinLoader = new SkinLoader(); + skinLoader = new SkinLoader; instances++; diff --git a/src/main.cpp b/src/main.cpp index 8fe1de86..321a4ee0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1048,7 +1048,7 @@ int main(int argc, char *argv[]) initHomeDir(); // Configure logger - logger = new Logger(); + logger = new Logger; logger->setLogFile(homeDir + std::string("/tmw.log")); logger->setLogToStandardOut(config.getValue("logToStandardOut", 0)); @@ -1088,7 +1088,7 @@ int main(int argc, char *argv[]) top->add(versionLabel, 25, 2); #endif ProgressBar *progressBar = new ProgressBar(0.0f, 100, 20, 168, 116, 31); - gcn::Label *progressLabel = new Label(); + gcn::Label *progressLabel = new Label; top->add(progressBar, 5, top->getHeight() - 5 - progressBar->getHeight()); top->add(progressLabel, 15 + progressBar->getWidth(), progressBar->getY() + 4); -- cgit v1.2.3-60-g2f50