summaryrefslogtreecommitdiffstats
path: root/kdf
diff options
context:
space:
mode:
Diffstat (limited to 'kdf')
-rw-r--r--kdf/CMakeLists.txt2
-rw-r--r--kdf/Makefile.am4
-rw-r--r--kdf/distdelist.cpp6
-rw-r--r--kdf/distdelist.h2
-rw-r--r--kdf/kdf.cpp6
-rw-r--r--kdf/kdf.h2
-rw-r--r--kdf/kdfwidget.cpp2
-rw-r--r--kdf/kdfwidget.h2
-rw-r--r--kdf/kwikdisk.cpp4
-rw-r--r--kdf/kwikdisk.h4
-rw-r--r--kdf/listview.h2
-rw-r--r--kdf/mntconfig.cpp2
-rw-r--r--kdf/mntconfig.h2
13 files changed, 20 insertions, 20 deletions
diff --git a/kdf/CMakeLists.txt b/kdf/CMakeLists.txt
index 43725af..22267af 100644
--- a/kdf/CMakeLists.txt
+++ b/kdf/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
tde_add_library( kdf_common STATIC_PIC AUTOMOC
SOURCES kdfwidget.cpp kdfconfig.cpp
- mntconfig.cpp disklist.cpp disks.cpp
+ mntconfig.cpp distdelist.cpp disks.cpp
listview.cpp optiondialog.cpp stdoption.cpp
LINK tdeui-shared tdeio-shared
)
diff --git a/kdf/Makefile.am b/kdf/Makefile.am
index 530aca1..0878bc9 100644
--- a/kdf/Makefile.am
+++ b/kdf/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
bin_PROGRAMS = kdf kwikdisk
noinst_LTLIBRARIES = libkdf_common.la
-libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.cpp \
+libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp distdelist.cpp \
disks.cpp listview.cpp optiondialog.cpp stdoption.cpp
kdf_SOURCES = kdf.cpp
@@ -23,7 +23,7 @@ kcm_kdf_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
kcm_kdf_la_LIBADD = libkdf_common.la $(LIB_TDEFILE)
noinst_HEADERS = kdfwidget.h kcmdf.h kdfconfig.h mntconfig.h \
-disks.h kdf.h disklist.h kwikdisk.h listview.h optiondialog.h stdoption.h
+disks.h kdf.h distdelist.h kwikdisk.h listview.h optiondialog.h stdoption.h
METASOURCES = AUTO
diff --git a/kdf/distdelist.cpp b/kdf/distdelist.cpp
index de0d213..27e26a6 100644
--- a/kdf/distdelist.cpp
+++ b/kdf/distdelist.cpp
@@ -1,5 +1,5 @@
/*
- * disklist.cpp
+ * distdelist.cpp
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kapplication.h>
-#include "disklist.h"
+#include "distdelist.h"
#define BLANK ' '
#define DELIMITER '#'
@@ -497,7 +497,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
}
-#include "disklist.moc"
+#include "distdelist.moc"
diff --git a/kdf/distdelist.h b/kdf/distdelist.h
index cee71b9..81871b2 100644
--- a/kdf/distdelist.h
+++ b/kdf/distdelist.h
@@ -1,5 +1,5 @@
/*
- * disklist.h
+ * distdelist.h
*
* Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
*
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index 26e4fbb..4b816e4 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -20,14 +20,14 @@
*/
#include <kapplication.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include "kdf.h"
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
static const char description[] =
I18N_NOOP("TDE free disk space utility");
diff --git a/kdf/kdf.h b/kdf/kdf.h
index 282f52e..9543650 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -22,7 +22,7 @@
#ifndef __KDF_H__
#define __KDF_H__
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kmenubar.h>
#include "kdfwidget.h"
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index d9aaffd..2698038 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -38,7 +38,7 @@
#include <kapplication.h>
#include <kcmenumngr.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kprocess.h>
#include "listview.h"
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index 872379f..e7bdef5 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -31,7 +31,7 @@
#include <tqlistview.h>
#include "disks.h"
-#include "disklist.h"
+#include "distdelist.h"
#include "mntconfig.h"
#include "kdfconfig.h"
#include "stdoption.h"
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 1bf7096..94559d1 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -35,13 +35,13 @@
#include <tqbitmap.h>
#include <tqpainter.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <klocale.h>
#include <kapplication.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <krun.h>
static const char description[] =
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index 5ce0d23..354de45 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -28,11 +28,11 @@
#include <config.h>
#endif
-#include "disklist.h"
+#include "distdelist.h"
#include "stdoption.h"
#include "optiondialog.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <ksystemtray.h>
/**
diff --git a/kdf/listview.h b/kdf/listview.h
index 196fc17..f8a8424 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -23,7 +23,7 @@
#include <tqdict.h>
#include <tqpixmap.h>
-#include <klistview.h>
+#include <tdelistview.h>
class CListView : public TDEListView
{
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 27249aa..aa2b566 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -55,7 +55,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
GUI = !init;
if (GUI)
{
- //tabList fillup waits until disklist.readDF() is done...
+ //tabList fillup waits until distdelist.readDF() is done...
mDiskList.readFSTAB();
mDiskList.readDF();
mInitializing = true;
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index f0b910a..3ae0c1a 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include "disks.h"
-#include "disklist.h"
+#include "distdelist.h"
class TQGroupBox;
class TQPushButton;