From 04d3010f7abb47f47ac6b328a408cc855cb9af4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 26 Feb 2013 15:46:33 +0100 Subject: [PATCH] Fix unintended rename of pickfile* --- kalarm/CMakeLists.txt | 2 +- kalarm/Makefile.am | 4 ++-- kalarm/editdlg.cpp | 2 +- kalarm/{pictdefileradio.cpp => pickfileradio.cpp} | 4 ++-- kalarm/{pictdefileradio.h => pickfileradio.h} | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) rename kalarm/{pictdefileradio.cpp => pickfileradio.cpp} (97%) rename kalarm/{pictdefileradio.h => pickfileradio.h} (95%) diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt index cd7295a4..b93cc671 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 9f3fb32a..cbf43ea3 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 0a7b3d58..ced83483 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 similarity index 97% rename from kalarm/pictdefileradio.cpp rename to kalarm/pickfileradio.cpp index 80911c29..15b56d94 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 * @@ -27,7 +27,7 @@ #include #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 similarity index 95% rename from kalarm/pictdefileradio.h rename to kalarm/pickfileradio.h index 87e4478e..f30ca7f6 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 * @@ -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