linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2936
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2012-06-01 19:26:20 +0200
message:
  0 -> nullptr for the latest VS beta
modified:
  dwt/include/dwt/widgets/StatusBar.h
  dwt/include/dwt/widgets/TabView.h
  dwt/include/dwt/widgets/ToolBar.h
  dwt/src/widgets/ToolBar.cpp
  win32/DirectoryListingFrame.cpp
  win32/FavHubsFrame.cpp
  win32/MainWindow.cpp
  win32/MainWindow.h
  win32/RichTextBox.cpp
  win32/WinUtil.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/widgets/StatusBar.h'
--- dwt/include/dwt/widgets/StatusBar.h	2012-01-13 20:55:20 +0000
+++ dwt/include/dwt/widgets/StatusBar.h	2012-06-01 17:26:20 +0000
@@ -167,7 +167,7 @@
 
 	// standard part (with icon / text).
 	struct Part : PartBase {
-		Part() : PartBase(), icon(0), clickF(0), rightClickF(0), dblClickF(0) { }
+		Part() : PartBase(), icon(nullptr), clickF(nullptr), rightClickF(nullptr), dblClickF(nullptr) { }
 
 		tstring text;
 		IconPtr icon;

=== modified file 'dwt/include/dwt/widgets/TabView.h'
--- dwt/include/dwt/widgets/TabView.h	2012-01-13 20:55:20 +0000
+++ dwt/include/dwt/widgets/TabView.h	2012-06-01 17:26:20 +0000
@@ -154,7 +154,7 @@
 		bool marked;
 
 		TabInfo(TabView* control, ContainerPtr w, IconPtr icon) :
-		control(control), w(w), icon(icon), handleContextMenu(0), marked(false) { }
+		control(control), w(w), icon(icon), handleContextMenu(nullptr), marked(false) { }
 	};
 
 	Theme theme;

=== modified file 'dwt/include/dwt/widgets/ToolBar.h'
--- dwt/include/dwt/widgets/ToolBar.h	2012-01-13 20:55:20 +0000
+++ dwt/include/dwt/widgets/ToolBar.h	2012-06-01 17:26:20 +0000
@@ -100,9 +100,9 @@
 	* @param showText show text on the button itself (otherwise, it will only be used for tooltips).
 	*/
 	void addButton(const std::string& id, const IconPtr& icon, const IconPtr& hotIcon, const tstring& text, bool showText = false,
-		unsigned helpId = 0, const Dispatcher::F& f = 0, const DropDownFunction& dropDownF = 0);
+		unsigned helpId = 0, const Dispatcher::F& f = nullptr, const DropDownFunction& dropDownF = nullptr);
 	void addButton(const std::string& id, int image, const tstring& text, bool showText = false,
-		unsigned helpId = 0, const Dispatcher::F& f = 0, const DropDownFunction& dropDownF = 0);
+		unsigned helpId = 0, const Dispatcher::F& f = nullptr, const DropDownFunction& dropDownF = nullptr);
 
 	/**
 	* fills a vector with ids of the current buttons, to represent the current state of the

=== modified file 'dwt/src/widgets/ToolBar.cpp'
--- dwt/src/widgets/ToolBar.cpp	2012-03-03 19:33:45 +0000
+++ dwt/src/widgets/ToolBar.cpp	2012-06-01 17:26:20 +0000
@@ -46,8 +46,8 @@
 itsHotImageList(0),
 itsDisabledImageList(0),
 customizing(false),
-customized(0),
-customizeHelp(0)
+customized(nullptr),
+customizeHelp(nullptr)
 {
 }
 

=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp	2012-04-15 22:19:38 +0000
+++ win32/DirectoryListingFrame.cpp	2012-06-01 17:26:20 +0000
@@ -366,7 +366,7 @@
 		ids.push_back("Find");
 		auto findId = ids.back();
 		toolbar->addButton(findId, WinUtil::toolbarIcon(IDI_SEARCH), 0, T_("Find"), true, IDH_FILE_LIST_FIND,
-			0, [this](const dwt::ScreenCoordinate&) { handleFindToggle(); });
+			nullptr, [this](const dwt::ScreenCoordinate&) { handleFindToggle(); });
 		toolbar->setLayout(ids);
 
 		rebar->add(toolbar, RBBS_NOGRIPPER);

=== modified file 'win32/FavHubsFrame.cpp'
--- win32/FavHubsFrame.cpp	2012-05-24 17:47:25 +0000
+++ win32/FavHubsFrame.cpp	2012-06-01 17:26:20 +0000
@@ -357,7 +357,7 @@
 	if(sel) {
 		fillGroupMenu(menu->appendPopup(T_("&Move to group")));
 	} else {
-		menu->appendItem(T_("&Move to group"), 0, dwt::IconPtr(), false);
+		menu->appendItem(T_("&Move to group"), nullptr, dwt::IconPtr(), false);
 	}
 	menu->appendItem(T_("Manage &groups"), [this] { handleGroups(); });
 

=== modified file 'win32/MainWindow.cpp'
--- win32/MainWindow.cpp	2012-05-30 17:28:37 +0000
+++ win32/MainWindow.cpp	2012-06-01 17:26:20 +0000
@@ -422,7 +422,7 @@
 	toolbar->addButton("OpenFL", WinUtil::toolbarIcon(IDI_OPEN_FILE_LIST), 0, T_("Open file list..."), false,
 		IDH_TOOLBAR_FILE_LIST, [this] { handleOpenFileList(); });
 	toolbar->addButton("Recents", WinUtil::toolbarIcon(IDI_RECENTS), 0, T_("Recent windows"), false,
-		IDH_TOOLBAR_RECENT, 0, [this](const dwt::ScreenCoordinate& pt) { handleRecent(pt); });
+		IDH_TOOLBAR_RECENT, nullptr, [this](const dwt::ScreenCoordinate& pt) { handleRecent(pt); });
 	toolbar->addButton("Settings", WinUtil::toolbarIcon(IDI_SETTINGS), 0, T_("Settings"), false,
 		IDH_TOOLBAR_SETTINGS, [this] { handleSettings(); });
 	toolbar->addButton(NotepadFrame::id, WinUtil::toolbarIcon(IDI_NOTEPAD), 0, T_("Notepad"), false,
@@ -676,7 +676,7 @@
 	const auto& recent = WindowManager::getInstance()->getRecent();
 	auto it = recent.find(T::id);
 	if(it == recent.end()) {
-		popup->appendItem(T_("(No recent item found)"), 0, 0, false);
+		popup->appendItem(T_("(No recent item found)"), nullptr, nullptr, false);
 	} else {
 
 		dwt::IconPtr favIcon = WinUtil::menuIcon(favIconId);
@@ -693,7 +693,7 @@
 
 			popup->appendItem(escapeMenu(Text::toT(title->second)),
 				std::bind(&T::parseWindowParams, mainWindow->getTabView(), params),
-				T::isFavorite(params) ? favIcon : 0);
+				T::isFavorite(params) ? favIcon : nullptr);
 		}
 	}
 }

=== modified file 'win32/MainWindow.h'
--- win32/MainWindow.h	2012-03-11 16:36:44 +0000
+++ win32/MainWindow.h	2012-06-01 17:26:20 +0000
@@ -66,7 +66,7 @@
 	void handleSettings();
 
 	/** show a balloon popup. refer to the dwt::Notification::addMessage doc for info about parameters. */
-	void notify(const tstring& title, const tstring& message, const std::function<void ()>& callback = 0, const dwt::IconPtr& balloonIcon = 0);
+	void notify(const tstring& title, const tstring& message, const std::function<void ()>& callback = nullptr, const dwt::IconPtr& balloonIcon = nullptr);
 	void setStaticWindowState(const string& id, bool open);
 	void TrayPM();
 

=== modified file 'win32/RichTextBox.cpp'
--- win32/RichTextBox.cpp	2012-05-04 21:20:44 +0000
+++ win32/RichTextBox.cpp	2012-06-01 17:26:20 +0000
@@ -36,7 +36,7 @@
 BaseType(parent),
 linkTip(0),
 linkTipPos(0),
-linkF(0)
+linkF(nullptr)
 {
 }
 

=== modified file 'win32/WinUtil.h'
--- win32/WinUtil.h	2012-05-16 11:34:47 +0000
+++ win32/WinUtil.h	2012-06-01 17:26:20 +0000
@@ -202,7 +202,7 @@
 	 */
 	static bool checkCommand(tstring& cmd, tstring& param, tstring& message, tstring& status, bool& thirdPerson);
 
-	static void notify(NotificationType notification, const tstring& balloonText, const std::function<void ()>& balloonCallback = 0);
+	static void notify(NotificationType notification, const tstring& balloonText, const std::function<void ()>& balloonCallback = nullptr);
 	static void playSound(const tstring& sound);
 
 	static void openFile(const tstring& file);