Author: aschnell Date: Thu Mar 12 16:16:47 2009 New Revision: 56100 URL: http://svn.opensuse.org/viewcvs/yast?rev=56100&view=rev Log: - cleanup Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Lock.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/ProcMounts.cc trunk/storage/libstorage/src/Regex.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.cc... ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Thu Mar 12 16:16:47 2009 @@ -4,12 +4,12 @@ */ +#include <stdarg.h> #include <unistd.h> -#include <string> #include <sys/stat.h> #include <sys/types.h> #include <dirent.h> - +#include <string> #include <boost/algorithm/string.hpp> #include <blocxx/AppenderLogger.hpp> Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h?... ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Thu Mar 12 16:16:47 2009 @@ -2,20 +2,17 @@ #define APP_UTIL_H #include <libintl.h> -#include <string.h> -#include <cstdarg> -#include <cstdio> -#include <fstream> #include <sstream> #include <locale> #include <string> #include <list> #include <map> -using std::string; namespace storage { + using std::string; + class AsciiFile; Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?re... ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Thu Mar 12 16:16:47 2009 @@ -3,10 +3,9 @@ */ #include <stdio.h> - #include <string> -#include <sstream> #include <ostream> +#include <fstream> #include <iomanip> #include <boost/algorithm/string.hpp> Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?re... ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Thu Mar 12 16:16:47 2009 @@ -6,8 +6,9 @@ #include <sys/mount.h> /* for BLKGETSIZE */ #include <linux/hdreg.h> /* for HDIO_GETGEO */ -#include <ostream> #include <string> +#include <ostream> +#include <fstream> #include <sstream> #include <iomanip> #include <boost/algorithm/string.hpp> Modified: trunk/storage/libstorage/src/Lock.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Lock.cc?re... ============================================================================== --- trunk/storage/libstorage/src/Lock.cc (original) +++ trunk/storage/libstorage/src/Lock.cc Thu Mar 12 16:16:47 2009 @@ -50,7 +50,7 @@ { // Opening lock-file failed. y2err("opening lock-file failed: " << strerror(errno)); - throw(LockException(0)); + throw LockException(0); } struct flock lock; @@ -69,12 +69,12 @@ // still 0). fcntl(fd, F_GETLK, &lock); y2err("locked by process " << lock.l_pid); - throw(LockException(lock.l_pid)); + throw LockException(lock.l_pid); default: // Some other error. y2err("getting lock failed: " << strerror(errno)); - throw(LockException(0)); + throw LockException(0); } } Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?re... ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Thu Mar 12 16:16:47 2009 @@ -3,7 +3,7 @@ */ #include <ostream> -#include <sstream> +#include <fstream> #include "y2storage/MdCo.h" #include "y2storage/Md.h" Modified: trunk/storage/libstorage/src/ProcMounts.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/ProcMounts... ============================================================================== --- trunk/storage/libstorage/src/ProcMounts.cc (original) +++ trunk/storage/libstorage/src/ProcMounts.cc Thu Mar 12 16:16:47 2009 @@ -3,7 +3,7 @@ Textdomain "storage" */ -#include <sstream> +#include <fstream> #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" Modified: trunk/storage/libstorage/src/Regex.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Regex.h?re... ============================================================================== --- trunk/storage/libstorage/src/Regex.h (original) +++ trunk/storage/libstorage/src/Regex.h Thu Mar 12 16:16:47 2009 @@ -11,10 +11,11 @@ #include <string> #include <boost/noncopyable.hpp> -using std::string; namespace storage { + using std::string; + class Regex : boost::noncopyable { Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?... ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Thu Mar 12 16:16:47 2009 @@ -2,10 +2,10 @@ Textdomain "storage" */ -#include <sstream> - #include <features.h> #include <sys/stat.h> +#include <sstream> +#include <fstream> #include "y2storage/Volume.h" #include "y2storage/Disk.h" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org