diff options
Diffstat (limited to 'tdecore/kmountpoint.cpp')
| -rw-r--r-- | tdecore/kmountpoint.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tdecore/kmountpoint.cpp b/tdecore/kmountpoint.cpp index a9be89e76..e5a67e0f3 100644 --- a/tdecore/kmountpoint.cpp +++ b/tdecore/kmountpoint.cpp @@ -25,7 +25,7 @@ #include <tqfile.h> -#include "kstandarddirs.h" +#include "tdestandarddirs.h" #include "kmountpoint.h" @@ -33,6 +33,7 @@ #include <volmgt.h> #endif #ifdef HAVE_SYS_MNTTAB_H +#include <stdio.h> #include <sys/mnttab.h> #endif #ifdef HAVE_MNTENT_H @@ -239,12 +240,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded) KMountPoint *mp = new KMountPoint(); mp->m_mountedFrom = TQFile::decodeName(mounted[i].f_mntfromname); mp->m_mountPoint = TQFile::decodeName(mounted[i].f_mntonname); - -#ifdef __osf__ - mp->m_mountType = TQFile::decodeName(mnt_names[mounted[i].f_type]); -#else mp->m_mountType = TQFile::decodeName(mounted[i].f_fstypename); -#endif if (infoNeeded & NeedMountOptions) { @@ -333,7 +329,7 @@ KMountPoint::List KMountPoint::currentMountPoints(int infoNeeded) } free( mntctl_buffer ); -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) //TODO? #else STRUCT_SETMNTENT mnttab; |