------------------------------------------------------------
revno: 2919
committer: Jacek Sieka <arnethed...@gmail.com>
branch nick: dcplusplus
timestamp: Sun 2012-05-13 13:48:45 +0200
message:
GCC 4.7 fixes
modified:
dwt/include/dwt/Dispatchers.h
dwt/include/dwt/Widget.h
dwt/include/dwt/resources/Handle.h
dwt/src/Widget.cpp
win32/FinishedFrameBase.h
--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk
Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'dwt/include/dwt/Dispatchers.h'
--- dwt/include/dwt/Dispatchers.h 2012-01-13 20:55:20 +0000
+++ dwt/include/dwt/Dispatchers.h 2012-05-13 11:48:45 +0000
@@ -61,7 +61,7 @@
ConvertBase(const typename BaseType::F& f_) : BaseType(f_) { }
bool operator()(const MSG& msg, LRESULT& ret) const {
- f((*C)(msg));
+ this->f((*C)(msg));
ret = value;
return handled;
}
@@ -73,7 +73,7 @@
VoidVoid(const F& f_) : Base<void ()>(f_) { }
bool operator()(const MSG& msg, LRESULT& ret) const {
- f();
+ this->f();
ret = value;
return handled;
}
=== modified file 'dwt/include/dwt/Widget.h'
--- dwt/include/dwt/Widget.h 2012-01-13 20:55:20 +0000
+++ dwt/include/dwt/Widget.h 2012-05-13 11:48:45 +0000
@@ -119,7 +119,7 @@
CallbackIter setCallback(const Message& msg, const CallbackType& callback);
/// Clear a callback registered to msg
- void clearCallback(const Message& msg, CallbackIter& i);
+ void clearCallback(const Message& msg, const CallbackIter& i);
/** Run a function bound to this widget asynchronously */
void callAsync(const Application::Callback& f);
=== modified file 'dwt/include/dwt/resources/Handle.h'
--- dwt/include/dwt/resources/Handle.h 2012-01-13 20:55:20 +0000
+++ dwt/include/dwt/resources/Handle.h 2012-05-13 11:48:45 +0000
@@ -84,7 +84,7 @@
virtual ~Handle() {
if(owned && h != Policy::NULL_HANDLE)
- release(h);
+ this->release(h);
}
private:
=== modified file 'dwt/src/Widget.cpp'
--- dwt/src/Widget.cpp 2012-03-03 19:33:45 +0000
+++ dwt/src/Widget.cpp 2012-05-13 11:48:45 +0000
@@ -123,7 +123,7 @@
return --callbacks.end();
}
-void Widget::clearCallback(const Message& msg, CallbackIter& i) {
+void Widget::clearCallback(const Message& msg, const CallbackIter& i) {
CallbackList& callbacks = handlers[msg];
callbacks.erase(i);
}
=== modified file 'win32/FinishedFrameBase.h'
--- win32/FinishedFrameBase.h 2012-03-03 19:33:45 +0000
+++ win32/FinishedFrameBase.h 2012-05-13 11:48:45 +0000
@@ -105,7 +105,7 @@
{
files = filesWindow->addChild(typename WidgetFiles::Seed(WinUtil::Seeds::table));
files->setTableStyle(LVS_EX_LABELTIP | LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT);
- addWidget(files);
+ this->addWidget(files);
WinUtil::makeColumns(files, filesColumns, FILES_COLUMN_LAST, SettingsManager::getInstance()->get(in_UL ? SettingsManager::FINISHED_UL_FILES_ORDER : SettingsManager::FINISHED_DL_FILES_ORDER),
SettingsManager::getInstance()->get(in_UL ? SettingsManager::FINISHED_UL_FILES_WIDTHS : SettingsManager::FINISHED_DL_FILES_WIDTHS));
@@ -121,7 +121,7 @@
{
users = usersWindow->addChild(typename WidgetUsers::Seed(WinUtil::Seeds::table));
users->setTableStyle(LVS_EX_LABELTIP | LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT);
- addWidget(users);
+ this->addWidget(users);
WinUtil::makeColumns(users, usersColumns, USERS_COLUMN_LAST, SettingsManager::getInstance()->get(in_UL ? SettingsManager::FINISHED_UL_USERS_ORDER : SettingsManager::FINISHED_DL_USERS_ORDER),
SettingsManager::getInstance()->get(in_UL ? SettingsManager::FINISHED_UL_USERS_WIDTHS : SettingsManager::FINISHED_DL_USERS_WIDTHS));
@@ -675,41 +675,41 @@
virtual void on(AddedFile, bool upload, const string& file, const FinishedFileItemPtr& entry) noexcept {
if(upload == in_UL)
- callAsync([=] { this->onAddedFile(file, entry); });
+ this->callAsync([=] { this->onAddedFile(file, entry); });
}
virtual void on(AddedUser, bool upload, const HintedUser& user, const FinishedUserItemPtr& entry) noexcept {
if(upload == in_UL)
- callAsync([=] { this->onAddedUser(user, entry); });
+ this->callAsync([=] { this->onAddedUser(user, entry); });
}
virtual void on(UpdatedFile, bool upload, const string& file, const FinishedFileItemPtr& entry) noexcept {
if(upload == in_UL) {
if(bOnlyFull && entry->isFull())
- callAsync([=] { this->onAddedFile(file, entry); });
+ this->callAsync([=] { this->onAddedFile(file, entry); });
else
- callAsync([=] { this->onUpdatedFile(file); });
+ this->callAsync([=] { this->onUpdatedFile(file); });
}
}
virtual void on(UpdatedUser, bool upload, const HintedUser& user) noexcept {
if(upload == in_UL)
- callAsync([=] { this->onUpdatedUser(user); });
+ this->callAsync([=] { this->onUpdatedUser(user); });
}
virtual void on(RemovedFile, bool upload, const string& file) noexcept {
if(upload == in_UL)
- callAsync([=] { this->onRemovedFile(file); });
+ this->callAsync([=] { this->onRemovedFile(file); });
}
virtual void on(RemovedUser, bool upload, const HintedUser& user) noexcept {
if(upload == in_UL)
- callAsync([=] { this->onRemovedUser(user); });
+ this->callAsync([=] { this->onRemovedUser(user); });
}
virtual void on(RemovedAll, bool upload) noexcept {
if(upload == in_UL)
- callAsync([=] { this->onRemovedAll(); });
+ this->callAsync([=] { this->onRemovedAll(); });
}
};
_______________________________________________
Mailing list: https://launchpad.net/~linuxdcpp-team
Post to : linuxdcpp-team@lists.launchpad.net
Unsubscribe : https://launchpad.net/~linuxdcpp-team
More help : https://help.launchpad.net/ListHelp
