#include <q...h> -> #include <Q...>

svn path=/trunk/KDE/kdepim/; revision=539487

alarmcalendar.cpp

@@ -23,9 +23,9 @@
 #include <time.h>
 
 #include <QFile>
-#include <qtextstream.h>
+#include <QTextStream>
 #include <QRegExp>
-#include <qtimer.h>
+#include <QTimer>
 
 #include <klocale.h>
 #include <kmessagebox.h>

alarmcalendar.h

@@ -21,7 +21,7 @@
 #ifndef ALARMCALENDAR_H
 #define ALARMCALENDAR_H
 
-#include <qobject.h>
+#include <QObject>
 #include <kurl.h>
 #include <libkcal/calendarlocal.h>
 #include "alarmevent.h"

alarmlistview.cpp

 /*
  *  alarmlistview.cpp  -  widget showing list of outstanding alarms
  *  Program:  kalarm
- *  Copyright (c) 2001-2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001-2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 #include "kalarm.h"
 
 #include <QToolTip>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <QPainter>
+#include <QStyle>
 #include <QRegExp>
 //Added by qt3to4:
 #include <q3header.h>

alarmtext.cpp

 /*
  *  alarmtext.cpp  -  text/email alarm text conversion
  *  Program:  kalarm
- *  Copyright (c) 2004, 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2004,2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  */
 
 #include "kalarm.h"
-#include <qstringlist.h>
+#include <QStringList>
 #include <klocale.h>
 
 #include "alarmevent.h"

calendarcompat.cpp

@@ -21,7 +21,7 @@
 #include "kalarm.h"
 
 #include <QFile>
-#include <qtextstream.h>
+#include <QTextStream>
 
 #include <kapplication.h>
 #include <kaboutdata.h>

daemon.cpp

@@ -20,8 +20,8 @@
 
 #include "kalarm.h"
 
-#include <qtimer.h>
-#include <qicon.h>
+#include <QTimer>
+#include <QIcon>
 #include <QByteArray>
 
 #include <kstandarddirs.h>

daemon.h

@@ -21,8 +21,8 @@
 #ifndef DAEMON_H
 #define DAEMON_H
 
-#include <qobject.h>
-#include <qdatetime.h>
+#include <QObject>
+#include <QDateTime>
 #include <ktoggleaction.h>
 
 #include <kalarmd/kalarmd.h>

editdlg.h

 /*
  *  editdlg.h  -  dialogue to create or modify an alarm or alarm template
  *  Program:  kalarm
- *  Copyright (c) 2001-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #ifndef EDITDLG_H
 #define EDITDLG_H
 
-#include <qdatetime.h>
+#include <QDateTime>
 
 #include <kdialog.h>
 

eventlistviewbase.cpp

 /*
  *  eventlistviewbase.cpp  -  base classes for widget showing list of events
  *  Program:  kalarm
- *  Copyright (c) 2004-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2004-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by

find.h

 /*
  *  find.h  -  search facility 
  *  Program:  kalarm
- *  Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,9 +21,9 @@
 #ifndef FIND_H
 #define FIND_H
 
-#include <qobject.h>
-#include <qpointer.h>
-#include <qstringlist.h>
+#include <QObject>
+#include <QPointer>
+#include <QStringList>
 
 class QCheckBox;
 class KFindDialog;

functions.h

@@ -23,7 +23,7 @@
 
 /**  @file functions.h - miscellaneous functions */
 
-#include <qsize.h>
+#include <QSize>
 #include <QString>
 #include <QList>
 

kalarmapp.cpp

@@ -24,8 +24,8 @@
 #include <ctype.h>
 #include <iostream>
 
-#include <qobject.h>
-#include <qtimer.h>
+#include <QObject>
+#include <QTimer>
 #include <QRegExp>
 #include <QFile>
 #include <QByteArray>

kalarmapp.h

 /*
  *  kalarmapp.h  -  the KAlarm application object
  *  Program:  kalarm
- *  Copyright © 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001-2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 
 /** @file kalarmapp.h - the KAlarm application object */
 
-#include <qpointer.h>
+#include <QPointer>
 #include <QQueue>
 #include <QList>
 class QTimer;

kalarmd/adcalendar.h

 /*
  *  adcalendar.h  -  calendar file access
  *  Program:  KAlarm's alarm daemon (kalarmd)
- *  Copyright © 2001, 2004-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001,2004-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,10 +28,7 @@
 class QDateTime;
 class ADCalendar;
 
-namespace KIO 
-{
-  class Job;
-}
+namespace KIO { class Job; }
 
 // Alarm Daemon calendar access
 class ADCalendar : public KCal::CalendarLocal

kalarmd/adconfigdata.cpp

 /*
  *  adcalendar.cpp  -  configuration file access
  *  Program:  KAlarm's alarm daemon (kalarmd)
- *  Copyright (c) 2001, 2004, 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001,2004-2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #include "kalarmd.h"
 
 #include <QRegExp>
-#include <qstringlist.h>
+#include <QStringList>
 
 #include <kconfig.h>
 #include <kstandarddirs.h>

kalarmd/alarmdaemon.cpp

 /*
  *  alarmdaemon.cpp  -  alarm daemon control routines
  *  Program:  KAlarm's alarm daemon (kalarmd)
- *  Copyright (c) 2001, 2004-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001,2004-2006 by David Jarvie <software@astrojar.org.uk>
  *  Based on the original, (c) 1998, 1999 Preston Brown
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <qtimer.h>
+#include <QTimer>
 #include <QFile>
-#include <qdatetime.h>
+#include <QDateTime>
 #include <QByteArray>
 
 #include <kapplication.h>

kalarmiface.h

@@ -24,9 +24,9 @@
 /** @file kalarmiface.h - DCOP interface to KAlarm */
 
 // No forward declarations - dcopidl2cpp won't work
+#include <QStringList>
 #include <dcopobject.h>
 #include <kurl.h>
-#include <qstringlist.h>
 class QString;
 
 /** KAlarmIface provides a DCOP interface for other applications to request

kamail.h

 /*
  *  kamail.h  -  email functions
  *  Program:  kalarm
- *  Copyright (c) 2002 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2002-2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #define KAMAIL_H
 
 #include <QString>
-#include <qstringlist.h>
+#include <QStringList>
 class DCOPCString;
 class KAEvent;
 class EmailAddressList;

pickfileradio.cpp

 /*
  *  pickfileradio.cpp  -  radio button with an associated file picker
  *  Program:  kalarm
- *  Copyright (c) 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #include "kalarm.h"
 
 #include <QPushButton>
-#include <qtimer.h>
+#include <QTimer>
 
 #include <kdebug.h>
 

preferences.h

 /*
  *  preferences.h  -  program preference settings
  *  Program:  kalarm
- *  Copyright (c) 2001 - 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001-2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,10 +23,10 @@
 
 #include "kalarm.h"
 
-#include <qobject.h>
+#include <QObject>
 #include <QColor>
 #include <QFont>
-#include <qdatetime.h>
+#include <QDateTime>
 class QWidget;
 
 #include "colourlist.h"

recurrenceeditprivate.h

 /*
  *  recurrenceeditprivate.h  -  private classes for recurrenceedit.cpp
  *  Program:  kalarm
- *  Copyright (c) 2003, 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2003,2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 
 #include <QList>
 #include <QFrame>
-#include <qbitarray.h>
+#include <QBitArray>
 
 class QLabel;
 class QWidget;

repetition.cpp

 /*
  *  repetition.cpp  -  pushbutton and dialogue to specify alarm repetition
  *  Program:  kalarm
- *  Copyright (c) 2004-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2004-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 
-#include <qtimer.h>
+#include <QTimer>
 #include <QLabel>
 #include <QGroupBox>
 #include <QVBoxLayout>

undo.cpp

@@ -20,7 +20,7 @@
 
 #include "kalarm.h"
 
-#include <qobject.h>
+#include <QObject>
 
 #include <kapplication.h>
 #include <klocale.h>

undo.h

 /*
  *  undo.h  -  undo/redo facility
  *  Program:  kalarm
- *  Copyright (c) 2005,2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2005-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 /**  @file undo.h - undo/redo facility */
 
 #include <QList>
-#include <qstringlist.h>
+#include <QStringList>
 
 class KAEvent;
 class UndoItem;