summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-02-26 15:46:33 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-02-26 15:46:33 +0100
commit04d3010f7abb47f47ac6b328a408cc855cb9af4b (patch)
treead144517f48d27525afad25de86077a4204ef354
parentf74503ce1b2872712090c76ed8715419eef8aa36 (diff)
downloadtdepim-04d3010f7abb47f47ac6b328a408cc855cb9af4b.tar.gz
tdepim-04d3010f7abb47f47ac6b328a408cc855cb9af4b.zip
Fix unintended rename of pickfile*
-rw-r--r--kalarm/CMakeLists.txt2
-rw-r--r--kalarm/Makefile.am4
-rw-r--r--kalarm/editdlg.cpp2
-rw-r--r--kalarm/pickfileradio.cpp (renamed from kalarm/pictdefileradio.cpp)4
-rw-r--r--kalarm/pickfileradio.h (renamed from kalarm/pictdefileradio.h)10
5 files changed, 11 insertions, 11 deletions
diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt
index cd7295a47..b93cc6712 100644
--- a/kalarm/CMakeLists.txt
+++ b/kalarm/CMakeLists.txt
@@ -59,7 +59,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Applications RE
tde_add_executable( kalarm AUTOMOC
SOURCES
birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp
- emailidcombo.cpp find.cpp pictdefileradio.cpp
+ emailidcombo.cpp find.cpp pickfileradio.cpp
calendarcompat.cpp eventlistviewbase.cpp alarmlistview.cpp
kamail.cpp timeselector.cpp fontcolourbutton.cpp
alarmtimewidget.cpp fontcolour.cpp soundpicker.cpp
diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am
index 9f3fb32a8..cbf43ea3a 100644
--- a/kalarm/Makefile.am
+++ b/kalarm/Makefile.am
@@ -20,7 +20,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
eventlistviewbase.cpp alarmlistview.cpp kamail.cpp timeselector.cpp \
templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
- emailidcombo.cpp find.cpp pictdefileradio.cpp calendarcompat.cpp
+ emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdenetwork/qgpgme
if include_ARTS
ARTSLIB = -lartskde
@@ -37,7 +37,7 @@ noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \
fontcolour.h fontcolourbutton.h functions.h kalarm.h kalarmapp.h \
kamail.h karecurrence.h latecancel.h mainwindow.h mainwindowbase.h \
- messagewin.h pictdefileradio.h prefdlg.h preferences.h recurrenceedit.h \
+ messagewin.h pickfileradio.h prefdlg.h preferences.h recurrenceedit.h \
recurrenceeditprivate.h reminder.h repetition.h sounddlg.h \
soundpicker.h specialactions.h startdaytimer.h templatedlg.h \
templatelistview.h templatemenuaction.h templatepickdlg.h timeselector.h \
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index 0a7b3d587..ced834833 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -71,7 +71,7 @@
#include "latecancel.h"
#include "lineedit.h"
#include "mainwindow.h"
-#include "pictdefileradio.h"
+#include "pickfileradio.h"
#include "preferences.h"
#include "radiobutton.h"
#include "recurrenceedit.h"
diff --git a/kalarm/pictdefileradio.cpp b/kalarm/pickfileradio.cpp
index 80911c298..15b56d942 100644
--- a/kalarm/pictdefileradio.cpp
+++ b/kalarm/pickfileradio.cpp
@@ -1,5 +1,5 @@
/*
- * pictdefileradio.cpp - radio button with an associated file picker
+ * pickfileradio.cpp - radio button with an associated file picker
* Program: kalarm
* Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
*
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include "lineedit.h"
-#include "pictdefileradio.moc"
+#include "pickfileradio.moc"
PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name)
diff --git a/kalarm/pictdefileradio.h b/kalarm/pickfileradio.h
index 87e4478e0..f30ca7f63 100644
--- a/kalarm/pictdefileradio.h
+++ b/kalarm/pickfileradio.h
@@ -1,5 +1,5 @@
/*
- * pictdefileradio.h - radio button with an associated file picker
+ * pickfileradio.h - radio button with an associated file picker
* Program: kalarm
* Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
*
@@ -18,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef PICTDEFILERADIO_H
-#define PICTDEFILERADIO_H
+#ifndef PICKFILERADIO_H
+#define PICKFILERADIO_H
-/** @file pictdefileradio.h - radio button with an associated file picker */
+/** @file pickfileradio.h - radio button with an associated file picker */
#include "radiobutton.h"
@@ -118,4 +118,4 @@ class PickFileRadio : public RadioButton
bool mRevertId; // true to revert to the previous radio button selection
};
-#endif // PICTDEFILERADIO_H
+#endif // PICKFILERADIO_H