aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Saint-Pierre <stpere@gmail.com>2012-07-20 14:28:44 -0400
committerPhilippe Saint-Pierre <stpere@gmail.com>2012-07-20 14:28:44 -0400
commitfc4d98a2c09fcc8e96eda3f9a234ae9cd71dba48 (patch)
treeb98d40615a97482247bf37b8ab8b6089a4aa3c11
parentfe0407cd4604f8c1fe33d3ca436daeae112173b7 (diff)
Coding style fixes, no functionnal changes.hrev44363
Following comments from Axel about a previous commit of mine. Sorry Axel for the delay.
-rw-r--r--src/apps/codycam/CodyCam.cpp3
-rw-r--r--src/apps/icon-o-matic/IconEditorApp.cpp4
-rw-r--r--src/apps/mediaconverter/MediaConverterWindow.cpp3
3 files changed, 4 insertions, 6 deletions
diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp
index 0df1c060a6..2b79880cd9 100644
--- a/src/apps/codycam/CodyCam.cpp
+++ b/src/apps/codycam/CodyCam.cpp
@@ -7,6 +7,7 @@
#include <Alert.h>
#include <Button.h>
#include <Catalog.h>
+#include <FindDirectory.h>
#include <LayoutBuilder.h>
#include <MediaDefs.h>
#include <MediaNode.h>
@@ -23,8 +24,6 @@
#include <TimeSource.h>
#include <TranslationKit.h>
-#include <storage/FindDirectory.h>
-
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "CodyCam"
diff --git a/src/apps/icon-o-matic/IconEditorApp.cpp b/src/apps/icon-o-matic/IconEditorApp.cpp
index 27f73a9484..69d3b54439 100644
--- a/src/apps/icon-o-matic/IconEditorApp.cpp
+++ b/src/apps/icon-o-matic/IconEditorApp.cpp
@@ -13,12 +13,12 @@
#include <Alert.h>
#include <Catalog.h>
#include <FilePanel.h>
+#include <FindDirectory.h>
#include <IconEditorProtocol.h>
#include <Locale.h>
#include <Message.h>
#include <Mime.h>
#include <Path.h>
-#include <storage/FindDirectory.h>
#include "support_settings.h"
@@ -331,7 +331,7 @@ IconEditorApp::_LastFilePath(path_kind which)
path = fLastOpenPath.String();
break;
}
- if (!path) {
+ if (path == NULL) {
BPath homePath;
if (find_directory(B_USER_DIRECTORY, &homePath) == B_OK)
diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp
index d97dcb1b0e..c6288660d2 100644
--- a/src/apps/mediaconverter/MediaConverterWindow.cpp
+++ b/src/apps/mediaconverter/MediaConverterWindow.cpp
@@ -16,6 +16,7 @@
#include <Catalog.h>
#include <ControlLook.h>
#include <FilePanel.h>
+#include <FindDirectory.h>
#include <LayoutBuilder.h>
#include <Locale.h>
#include <Menu.h>
@@ -31,8 +32,6 @@
#include <StringView.h>
#include <TextControl.h>
-#include <storage/FindDirectory.h>
-
#include "MediaFileInfoView.h"
#include "MediaFileListView.h"
#include "MessageConstants.h"