i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warnings, minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22569 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-10-15 17:36:34 +00:00
parent 332d5f437e
commit 22df5cfa2f
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/packageinstaller/InstalledPackageInfo.cpp
+6 -5
View File
@@ -8,12 +8,13 @@
#include "InstalledPackageInfo.h" #include "InstalledPackageInfo.h"
#include <Directory.h>
#include <FindDirectory.h>
#include <Entry.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <posix/string.h>
#include <Directory.h>
#include <Entry.h>
#include <FindDirectory.h>
const char * kPackagesDir = "packages"; const char * kPackagesDir = "packages";
@@ -215,7 +216,7 @@ InstalledPackageInfo::Uninstall()
// Try to remove all entries that are present in the list // Try to remove all entries that are present in the list
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
iter = static_cast<BString *>(fInstalledItems.ItemAt(count - i - 1)); iter = static_cast<BString *>(fInstalledItems.ItemAt(count - i - 1));
fprintf(stderr, "Removing: %s (%d/%d)\n", iter->String(), i, count); fprintf(stderr, "Removing: %s (%ld/%ld)\n", iter->String(), i, count);
ret = entry.SetTo(iter->String()); ret = entry.SetTo(iter->String());
if (ret == B_BUSY) { if (ret == B_BUSY) {
// The entry's directory is locked - wait a few cycles for it to // The entry's directory is locked - wait a few cycles for it to
src/apps/packageinstaller/PackageView.h
+9 -5
View File
@@ -5,17 +5,23 @@
* Author: * Author:
* Łukasz 'Sil2100' Zemczak <[email protected]> * Łukasz 'Sil2100' Zemczak <[email protected]>
*/ */
#ifndef PACKAGEVIEW_H #ifndef PACKAGE_VIEW_H
#define PACKAGEVIEW_H #define PACKAGE_VIEW_H
#include "PackageInfo.h" #include "PackageInfo.h"
#include "PackageStatus.h" #include "PackageStatus.h"
#include <View.h> #include <View.h>
#include <Box.h> #include <Box.h>
#include <Button.h> #include <Button.h>
#include <MenuField.h> #include <MenuField.h>
#include <FilePanel.h> #include <FilePanel.h>
class BPopUpMenu;
class BTextView;
enum { enum {
P_MSG_GROUP_CHANGED = 'gpch', P_MSG_GROUP_CHANGED = 'gpch',
P_MSG_PATH_CHANGED, P_MSG_PATH_CHANGED,
@@ -23,7 +29,6 @@ enum {
P_MSG_INSTALL P_MSG_INSTALL
}; };
class PackageView : public BView { class PackageView : public BView {
public: public:
PackageView(BRect frame, const entry_ref *ref); PackageView(BRect frame, const entry_ref *ref);
@@ -54,6 +59,5 @@ class PackageView : public BView {
PackageStatus *fStatusWindow; PackageStatus *fStatusWindow;
}; };
#endif // PACKAGE_VIEW_H
#endif