summaryrefslogtreecommitdiff
path: root/src/gui/shortcutwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/shortcutwindow.cpp
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadmv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
mv-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/shortcutwindow.cpp')
-rw-r--r--src/gui/shortcutwindow.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/shortcutwindow.cpp b/src/gui/shortcutwindow.cpp
index 6d48da197..eff28def7 100644
--- a/src/gui/shortcutwindow.cpp
+++ b/src/gui/shortcutwindow.cpp
@@ -54,7 +54,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title,
ShortcutContainer *content,
std::string skinFile,
int width, int height) :
- Window("Window", false, 0, skinFile)
+ Window("Window", false, nullptr, skinFile)
{
setWindowName(title);
// no title presented, title bar is padding so window can be moved.
@@ -66,7 +66,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title,
setupWindow->registerWindowForReset(this);
- mTabs = 0;
+ mTabs = nullptr;
mItems = content;
const int border = SCROLL_PADDING * 2 + getPadding() * 2;
@@ -100,7 +100,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title,
ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile,
int width, int height) :
- Window("Window", false, 0, skinFile)
+ Window("Window", false, nullptr, skinFile)
{
setWindowName(title);
// no title presented, title bar is padding so window can be moved.
@@ -114,7 +114,7 @@ ShortcutWindow::ShortcutWindow(const std::string &title, std::string skinFile,
mTabs = new TabbedArea;
- mItems = 0;
+ mItems = nullptr;
const int border = SCROLL_PADDING * 2 + getPadding() * 2;
@@ -138,9 +138,9 @@ ShortcutWindow::~ShortcutWindow()
if (mTabs)
mTabs->removeAll();
delete mTabs;
- mTabs = 0;
+ mTabs = nullptr;
delete mItems;
- mItems = 0;
+ mItems = nullptr;
}
void ShortcutWindow::addTab(std::string name, ShortcutContainer *content)