author | kergoth <kergoth> | 2002-11-11 17:24:58 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-11 17:24:58 (UTC) |
commit | 94cc15c14d0a15dd21258730d058f72dae730cf4 (patch) (unidiff) | |
tree | 9de88e05e769ac0f150693411b038c50e23662fb | |
parent | 84cafc64d515c80aebd50e70b47e3da93d742c8a (diff) | |
download | opie-94cc15c14d0a15dd21258730d058f72dae730cf4.zip opie-94cc15c14d0a15dd21258730d058f72dae730cf4.tar.gz opie-94cc15c14d0a15dd21258730d058f72dae730cf4.tar.bz2 |
add #include <iostream>, and std:: when not 'using namespace std'
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mem.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 4e9cc12..5ccd3c3 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -6,24 +6,26 @@ | |||
6 | email : andy.qua@blueyonder.co.uk | 6 | email : andy.qua@blueyonder.co.uk |
7 | ***************************************************************************/ | 7 | ***************************************************************************/ |
8 | 8 | ||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <iostream> | ||
19 | |||
18 | #include <qmenubar.h> | 20 | #include <qmenubar.h> |
19 | #include <qpopupmenu.h> | 21 | #include <qpopupmenu.h> |
20 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
21 | 23 | ||
22 | #include "mainwin.h" | 24 | #include "mainwin.h" |
23 | #include "datamgr.h" | 25 | #include "datamgr.h" |
24 | #include "networkpkgmgr.h" | 26 | #include "networkpkgmgr.h" |
25 | #include "settingsimpl.h" | 27 | #include "settingsimpl.h" |
26 | #include "helpwindow.h" | 28 | #include "helpwindow.h" |
27 | #include "utils.h" | 29 | #include "utils.h" |
28 | #include "global.h" | 30 | #include "global.h" |
29 | 31 | ||
@@ -72,25 +74,25 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
72 | stack->raiseWidget( networkPkgWindow ); | 74 | stack->raiseWidget( networkPkgWindow ); |
73 | } | 75 | } |
74 | 76 | ||
75 | MainWindow :: ~MainWindow() | 77 | MainWindow :: ~MainWindow() |
76 | { | 78 | { |
77 | delete networkPkgWindow; | 79 | delete networkPkgWindow; |
78 | } | 80 | } |
79 | 81 | ||
80 | void MainWindow :: setDocument( const QString &doc ) | 82 | void MainWindow :: setDocument( const QString &doc ) |
81 | { | 83 | { |
82 | // Remove path from package | 84 | // Remove path from package |
83 | QString package = Utils::getPackageNameFromIpkFilename( doc ); | 85 | QString package = Utils::getPackageNameFromIpkFilename( doc ); |
84 | cout << "Selecting package " << package << endl; | 86 | std::cout << "Selecting package " << package << std::endl; |
85 | networkPkgWindow->selectLocalPackage( package ); | 87 | networkPkgWindow->selectLocalPackage( package ); |
86 | } | 88 | } |
87 | 89 | ||
88 | void MainWindow :: displaySettings() | 90 | void MainWindow :: displaySettings() |
89 | { | 91 | { |
90 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); | 92 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); |
91 | if ( dlg->showDlg( 0 ) ) | 93 | if ( dlg->showDlg( 0 ) ) |
92 | networkPkgWindow->updateData(); | 94 | networkPkgWindow->updateData(); |
93 | delete dlg; | 95 | delete dlg; |
94 | } | 96 | } |
95 | 97 | ||
96 | void MainWindow :: displayHelp() | 98 | void MainWindow :: displayHelp() |
diff --git a/noncore/settings/aqpkg/mem.cpp b/noncore/settings/aqpkg/mem.cpp index 76ce35c..405aada 100644 --- a/noncore/settings/aqpkg/mem.cpp +++ b/noncore/settings/aqpkg/mem.cpp | |||
@@ -7,24 +7,25 @@ | |||
7 | ***************************************************************************/ | 7 | ***************************************************************************/ |
8 | 8 | ||
9 | /*************************************************************************** | 9 | /*************************************************************************** |
10 | * * | 10 | * * |
11 | * This program is free software; you can redistribute it and/or modify * | 11 | * This program is free software; you can redistribute it and/or modify * |
12 | * it under the terms of the GNU General Public License as published by * | 12 | * it under the terms of the GNU General Public License as published by * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 13 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 14 | * (at your option) any later version. * |
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | #include <stdio.h> | 17 | #include <stdio.h> |
18 | #include <fstream> | 18 | #include <fstream> |
19 | #include <iostream> | ||
19 | #include <list> | 20 | #include <list> |
20 | using namespace std; | 21 | using namespace std; |
21 | 22 | ||
22 | #define __MEMFILE_C | 23 | #define __MEMFILE_C |
23 | #include "global.h" | 24 | #include "global.h" |
24 | 25 | ||
25 | #ifdef _DEBUG | 26 | #ifdef _DEBUG |
26 | 27 | ||
27 | void __cdecl *operator new( unsigned int size, const char *file, int line ) | 28 | void __cdecl *operator new( unsigned int size, const char *file, int line ) |
28 | { | 29 | { |
29 | void *ptr = (void *)malloc(size); | 30 | void *ptr = (void *)malloc(size); |
30 | AddTrack((long)ptr, size, file, line); | 31 | AddTrack((long)ptr, size, file, line); |