Build fixes for gcc 4 by Ilzu Siiteri. Small changes by myself.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15256 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
d0e89d5302
commit
9a8ef58959
@ -1833,7 +1833,7 @@ void BComboBox::MakeFocus(bool state)
|
||||
// #pragma mark -
|
||||
|
||||
|
||||
BDefaultChoiceList::BDefaultChoiceList(BComboBox *owner = NULL)
|
||||
BDefaultChoiceList::BDefaultChoiceList(BComboBox *owner)
|
||||
{
|
||||
fOwner = owner;
|
||||
fList = new StringObjectList();
|
||||
|
@ -196,7 +196,7 @@ class TTextView : public BTextView
|
||||
void ContentChanged(void);
|
||||
|
||||
class Reader;
|
||||
friend TTextView::Reader;
|
||||
friend class TTextView::Reader;
|
||||
|
||||
char *fYankBuffer;
|
||||
int32 fLastPosition;
|
||||
|
@ -62,6 +62,7 @@ All rights reserved.
|
||||
#include <CharacterSetRoster.h>
|
||||
|
||||
using namespace BPrivate;
|
||||
using std::map;
|
||||
|
||||
#include "Mail.h"
|
||||
#include "Header.h"
|
||||
@ -131,7 +132,8 @@ THeaderView::THeaderView (
|
||||
fResending(resending),
|
||||
fBccMenu(NULL),
|
||||
fCcMenu(NULL),
|
||||
fToMenu(NULL)
|
||||
fToMenu(NULL),
|
||||
fEmailList(NULL)
|
||||
{
|
||||
BMenuField *field;
|
||||
BMessage *msg;
|
||||
|
@ -29,7 +29,7 @@ Application BeMail :
|
||||
Words.cpp
|
||||
KUndoBuffer.cpp ;
|
||||
|
||||
LinkAgainst BeMail : be tracker stdc++.r4 libmail.so libtextencoding.so ;
|
||||
LinkAgainst BeMail : be tracker $(TARGET_LIBSTDC++) libmail.so libtextencoding.so ;
|
||||
|
||||
Package haiku-maildaemon-cvs :
|
||||
BeMail :
|
||||
|
@ -45,10 +45,12 @@ class BQuery;
|
||||
class BVolume;
|
||||
class QHandler;
|
||||
|
||||
using std::vector;
|
||||
|
||||
typedef vector<BQuery *> query_t;
|
||||
|
||||
class QueryMenu : public BPopUpMenu {
|
||||
friend QHandler;
|
||||
friend class QHandler;
|
||||
|
||||
public:
|
||||
QueryMenu(const char *title, bool popUp=false,
|
||||
|
@ -9,6 +9,8 @@
|
||||
#include <List.h>
|
||||
#include "CDAudioDevice.h"
|
||||
|
||||
using std::vector;
|
||||
|
||||
class CDDBData
|
||||
{
|
||||
public:
|
||||
|
@ -92,4 +92,4 @@ public:
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -41,4 +41,4 @@ private:
|
||||
bool fButtonState;
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
@ -3,6 +3,8 @@
|
||||
#include <stdio.h>
|
||||
#include <NetworkKit.h>
|
||||
|
||||
using std::string;
|
||||
|
||||
class FtpClient
|
||||
{
|
||||
public:
|
||||
|
@ -10,4 +10,4 @@ Application CodyCam :
|
||||
VideoConsumer.cpp
|
||||
;
|
||||
|
||||
LinkAgainst CodyCam : be media translation netapi stdc++.r4 ;
|
||||
LinkAgainst CodyCam : be media translation netapi $(TARGET_LIBSTDC++) ;
|
||||
|
@ -13,7 +13,7 @@ Application PoorMan : PoorMan.cpp
|
||||
PoorManPreferencesWindow.cpp
|
||||
PoorManApplication.cpp
|
||||
constants.cpp
|
||||
: be tracker stdc++.r4
|
||||
: be tracker $(TARGET_LIBSTDC++)
|
||||
;
|
||||
|
||||
|
||||
|
@ -1,7 +1,9 @@
|
||||
#include "NodeMessage.h"
|
||||
#include <StorageKit.h>
|
||||
#include <fs_attr.h>
|
||||
#include <vector.h>
|
||||
#include <vector>
|
||||
|
||||
using std::vector;
|
||||
/*
|
||||
These functions gives a nice BMessage interface to node attributes,
|
||||
by letting you transfer attributes to and from BMessages. It makes
|
||||
|
@ -14,6 +14,8 @@ class _EXPORT BRemoteMailStorageProtocol;
|
||||
#include <ChainRunner.h>
|
||||
#include <E-mail.h>
|
||||
|
||||
using std::map;
|
||||
|
||||
namespace {
|
||||
|
||||
void GetSubFolders(BDirectory *of, BStringList *folders, const char *prepend = "");
|
||||
|
@ -8,8 +8,12 @@ Author: Misza (misza@ihug.com.au)
|
||||
|
||||
*/
|
||||
|
||||
|
||||
#include "DetailsView.h"
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
DetailsView::DetailsView() :
|
||||
BView(BRect(40,31,290,157),"detailsview",B_FOLLOW_NONE,B_WILL_DRAW)
|
||||
{
|
||||
|
@ -13,4 +13,4 @@ Preference DialUpNetworking :
|
||||
DUNWindow.cpp
|
||||
NewConnectionWindow.cpp ;
|
||||
|
||||
LinkAgainst DialUpNetworking : be tracker stdc++.r4 ;
|
||||
LinkAgainst DialUpNetworking : be tracker $(TARGET_LIBSTDC++) ;
|
@ -9,8 +9,13 @@ Authors: Misza (misza@ihug.com.au)
|
||||
|
||||
*/
|
||||
|
||||
|
||||
#include "LocationView.h"
|
||||
|
||||
using std::cout;
|
||||
using std::endl;
|
||||
|
||||
|
||||
// LocationView -- View inside DUNWindow
|
||||
LocationView::LocationView() : BView(BRect(55,31,285,87),"locationview",B_FOLLOW_NONE,B_WILL_DRAW)
|
||||
{
|
||||
|
@ -8,8 +8,11 @@ Author: Sikosis (beos@gravity24hr.com)
|
||||
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "ModemWindow.h"
|
||||
|
||||
|
||||
// CenterWindowOnScreen -- Centers the BWindow to the Current Screen
|
||||
static void CenterWindowOnScreen(BWindow* w)
|
||||
{
|
||||
|
@ -77,7 +77,7 @@ class Account
|
||||
void Delete(int32 type = IN_AND_OUTBOUND_TYPE);
|
||||
|
||||
private:
|
||||
friend Accounts;
|
||||
friend class Accounts;
|
||||
void AddToListView();
|
||||
private:
|
||||
void CreateInbound();
|
||||
|
@ -54,7 +54,7 @@ class FilterConfigView : public BBox
|
||||
virtual void AttachedToWindow();
|
||||
|
||||
protected:
|
||||
friend FiltersConfigView;
|
||||
friend class FiltersConfigView;
|
||||
|
||||
void Load(BMessage *msg,entry_ref *ref);
|
||||
void Remove(bool deleteMessage = true);
|
||||
|
@ -11,7 +11,7 @@
|
||||
#define B_GREY 216,216,216
|
||||
|
||||
|
||||
void BackupWin::Flatten_bak(const char *bak_name = NULL)
|
||||
void BackupWin::Flatten_bak(const char *bak_name)
|
||||
{
|
||||
/*To understand what follows, u'd better open the
|
||||
/boot/home/config/settings/network textfile */
|
||||
@ -155,7 +155,7 @@ void NetworkWindow::Get_Configs_List()
|
||||
}
|
||||
}
|
||||
|
||||
void NetworkWindow::GetEverything(const char *bakname = NULL)
|
||||
void NetworkWindow::GetEverything(const char *bakname)
|
||||
{
|
||||
//The configuration is saved in the /boot/home/config/settings/network
|
||||
//text file so the config is static. Maybe we could switch to dynamic by
|
||||
@ -163,8 +163,9 @@ void NetworkWindow::GetEverything(const char *bakname = NULL)
|
||||
|
||||
if (bakname == NULL
|
||||
&& BEntry("/boot/home/config/settings/network").Exists() == false){
|
||||
BAlert *alert = new BAlert("Network Alert","Your network config file doesn't exists.\n
|
||||
It should be located at/boot/home/config/settings/network "
|
||||
BAlert *alert = new BAlert("Network Alert",
|
||||
"Your network config file doesn't exists.\n"
|
||||
"It should be located at/boot/home/config/settings/network "
|
||||
,"Oups...",NULL,NULL,B_WIDTH_FROM_WIDEST,B_INFO_ALERT);
|
||||
alert->Go();
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ Server mail_daemon :
|
||||
main.cpp
|
||||
;
|
||||
|
||||
LinkAgainst mail_daemon : be libmail.so tracker stdc++.r4 $(NETWORK_LIBS) ;
|
||||
LinkAgainst mail_daemon : be libmail.so tracker $(TARGET_LIBSTDC++) $(NETWORK_LIBS) ;
|
||||
|
||||
Package haiku-maildaemon-cvs :
|
||||
mail_daemon :
|
||||
|
@ -51,6 +51,8 @@
|
||||
} bsppp_status_t;
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
using std::map;
|
||||
|
||||
typedef struct glorbal {
|
||||
size_t bytes;
|
||||
|
Loading…
Reference in New Issue
Block a user