From dc251d0b537526e8bbe86bb3f20e2a437fd2d4a3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 17 Feb 2013 01:58:09 -0600
Subject: Fix unintended rename of disklist

---
 kdf/CMakeLists.txt | 2 +-
 kdf/Makefile.am    | 4 ++--
 kdf/distdelist.cpp | 6 +++---
 kdf/distdelist.h   | 2 +-
 kdf/kdfwidget.h    | 2 +-
 kdf/kwikdisk.h     | 2 +-
 kdf/mntconfig.cpp  | 2 +-
 kdf/mntconfig.h    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kdf/CMakeLists.txt b/kdf/CMakeLists.txt
index 22267af..43725af 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 distdelist.cpp disks.cpp
+    mntconfig.cpp disklist.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 0878bc9..530aca1 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 distdelist.cpp \
+libkdf_common_la_SOURCES = kdfwidget.cpp kdfconfig.cpp mntconfig.cpp disklist.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 distdelist.h kwikdisk.h listview.h optiondialog.h stdoption.h
+disks.h kdf.h disklist.h kwikdisk.h listview.h optiondialog.h stdoption.h
 
 METASOURCES = AUTO
 
diff --git a/kdf/distdelist.cpp b/kdf/distdelist.cpp
index 2623ecd..b98081c 100644
--- a/kdf/distdelist.cpp
+++ b/kdf/distdelist.cpp
@@ -1,5 +1,5 @@
 /*
- * distdelist.cpp
+ * disklist.cpp
  *
  * Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
  *
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 
-#include "distdelist.h"
+#include "disklist.h"
 
 #define BLANK ' '
 #define DELIMITER '#'
@@ -497,7 +497,7 @@ void DiskList::replaceDeviceEntry(DiskEntry *disk)
 
 }
 
-#include "distdelist.moc"
+#include "disklist.moc"
 
 
 
diff --git a/kdf/distdelist.h b/kdf/distdelist.h
index 49e2a1b..926ca36 100644
--- a/kdf/distdelist.h
+++ b/kdf/distdelist.h
@@ -1,5 +1,5 @@
 /*
- * distdelist.h
+ * disklist.h
  *
  * Copyright (c) 1999 Michael Kropfberger <michael.kropfberger@gmx.net>
  *
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index e7bdef5..872379f 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -31,7 +31,7 @@
 #include <tqlistview.h>
 
 #include "disks.h"
-#include "distdelist.h"
+#include "disklist.h"
 #include "mntconfig.h"
 #include "kdfconfig.h"
 #include "stdoption.h"
diff --git a/kdf/kwikdisk.h b/kdf/kwikdisk.h
index 354de45..ce8db57 100644
--- a/kdf/kwikdisk.h
+++ b/kdf/kwikdisk.h
@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include "distdelist.h"
+#include "disklist.h"
 #include "stdoption.h"
 #include "optiondialog.h"
 
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index e70f915..37b9ff8 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 distdelist.readDF() is done...
+    //tabList fillup waits until disklist.readDF() is done...
     mDiskList.readFSTAB();
     mDiskList.readDF();
     mInitializing = true;
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index 6ea8125..8e510cd 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 
 #include "disks.h"
-#include "distdelist.h"
+#include "disklist.h"
 
 class TQGroupBox;
 class TQPushButton;
-- 
cgit v1.2.3