Browse Source

convert all headers

convert-to-qt5
Wes Hardaker 8 years ago
parent
commit
08d6161c75
  1. 2
      AboutDialog.h
  2. 2
      GoalBar.cpp
  3. 10
      MainWindow.cpp
  4. 2
      MainWindow.h
  5. 6
      Morse.cpp
  6. 6
      Morse.h
  7. 10
      Prefs.cpp
  8. 2
      Prefs.h
  9. 2
      main.cpp
  10. 16
      modes/ChooseSequenceDialog.h
  11. 8
      modes/FrontPage.cpp
  12. 18
      modes/KeyTraining.cpp
  13. 2
      modes/KeyTraining.h
  14. 2
      modes/LetterTrainingMode.cpp
  15. 2
      modes/LetterTrainingMode.h
  16. 14
      modes/MorseMode.cpp
  17. 2
      modes/MorseMode.h
  18. 4
      modes/QModeStart.cpp
  19. 2
      modes/QModeStart.h
  20. 10
      modes/ReadMode.cpp
  21. 6
      modes/ReadMode.h
  22. 6
      modes/SpeedTrainingMode.cpp
  23. 2
      modes/SpeedTrainingMode.h
  24. 6
      modes/TrainingMode.cpp
  25. 18
      modes/TrainingMode.h
  26. 2
      modes/WordTrainingMode.cpp
  27. 6
      modes/games/GroupGame.cpp
  28. 2
      modes/games/GroupGame.h
  29. 8
      modes/games/HighScoresDialog.cpp
  30. 6
      modes/games/HighScoresDialog.h
  31. 2
      modes/games/Invader.cpp
  32. 8
      modes/games/KeyInvaders.cpp
  33. 2
      modes/games/KeyInvaders.h
  34. 2
      modes/games/MGameMode.h
  35. 8
      modes/games/WordGame.cpp
  36. 22
      ui_MainWindow.h
  37. 4
      widgets/KeyTimingDisplay.cpp

2
AboutDialog.h

@ -1,7 +1,7 @@
#ifndef ABOUTDIALOG_H
#define ABOUTDIALOG_H
#include <QtGui/QDialog>
#include <QDialog>
namespace Ui {
class AboutDialog;

2
GoalBar.cpp

@ -1,6 +1,6 @@
#include "GoalBar.h"
#include <QtGui/QPainter>
#include <QPainter>
#include <qdebug.h>
GoalBar::GoalBar(QWidget *parent)

10
MainWindow.cpp

@ -2,9 +2,9 @@
#include "ui_MainWindow.h"
#include "ui_AboutDialog.h"
#include <QtMultimedia/QAudioFormat>
#include <QtGui/QMenu>
#include <QtGui/QMenuBar>
#include <QtGui/QIcon>
#include <QMenu>
#include <QMenuBar>
#include <QIcon>
#include <qdebug.h>
// for SMALL_DEVICE definition
@ -94,8 +94,8 @@ MainWindow::createAudioOutput()
{
QAudioFormat settings;
settings.setFrequency(44100);
settings.setChannels(1);
// TODO: settings.setFrequency(44100);
// TODO: settings.setChannels(1);
settings.setSampleSize(16);
settings.setCodec("audio/pcm");
settings.setByteOrder(QAudioFormat::LittleEndian);

2
MainWindow.h

@ -4,7 +4,7 @@
#include <QMainWindow>
#include <QtMultimedia/QAudioOutput>
#include <QtCore/QSignalMapper>
#include <QtGui/QKeyEvent>
#include <QKeyEvent>
#include "Generator.h"
#include "Morse.h"

6
Morse.cpp

@ -2,9 +2,9 @@
#include "Morse.h"
#include <QtCore/QSettings>
#include <QtGui/QMenu>
#include <QtGui/QMenuBar>
#include <QtGui/QSizePolicy>
#include <QMenu>
#include <QMenuBar>
#include <QSizePolicy>
#include <qdebug.h>
#include "MainWindow.h"

6
Morse.h

@ -5,11 +5,11 @@
#include <QtMultimedia/QAudioOutput>
#include <QtCore/QMap>
#include <QtCore/QList>
#include <QtGui/QLabel>
#include <QLabel>
#include <QtCore/QTime>
#include <QtCore/QTimer>
#include <QtGui/QTextCursor>
#include <QtGui/QIcon>
#include <QTextCursor>
#include <QIcon>
#include <QtCore/QSignalMapper>
#include "Generator.h"

10
Prefs.cpp

@ -1,11 +1,11 @@
#include "Prefs.h"
#include "Morse.h"
#include <QtGui/QTabWidget>
#include <QtGui/QFormLayout>
#include <QtGui/QSpinBox>
#include <QtGui/QVBoxLayout>
#include <QtGui/QDialogButtonBox>
#include <QTabWidget>
#include <QFormLayout>
#include <QSpinBox>
#include <QVBoxLayout>
#include <QDialogButtonBox>
Prefs::Prefs(Morse *morse, QWidget *parent) :
QDialog(parent, Qt::Window), m_morse(morse), m_oldTone(-1)

2
Prefs.h

@ -2,7 +2,7 @@
#define PREFS_H
#include "Morse.h"
#include <QDialog>
#include <QtGui/QSpinBox>
#include <QSpinBox>
namespace Ui {
class Prefs;

2
main.cpp

@ -1,4 +1,4 @@
#include <QtGui/QApplication>
#include <QApplication>
#include "MainWindow.h"
int main(int argc, char *argv[])

16
modes/ChooseSequenceDialog.h

@ -5,14 +5,14 @@
#include <QtCore/QTime>
#include <QtCore/QSet>
#include <QtCore/QMap>
#include <QtGui/QGridLayout>
#include <QtGui/QAction>
#include <QtGui/QGridLayout>
#include <QtGui/QPushButton>
#include <QtGui/QDialogButtonBox>
#include <QtGui/QMessageBox>
#include <QtGui/QInputDialog>
#include <QtGui/QCheckBox>
#include <QGridLayout>
#include <QAction>
#include <QGridLayout>
#include <QPushButton>
#include <QDialogButtonBox>
#include <QMessageBox>
#include <QInputDialog>
#include <QCheckBox>
class CustomSequenceDialog : public QDialog
{

8
modes/FrontPage.cpp

@ -1,10 +1,10 @@
#include "FrontPage.h"
#include "Morse.h"
#include <QtGui/QVBoxLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QPushButton>
#include <QtGui/QGroupBox>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QPushButton>
#include <QGroupBox>
#include <QtCore/QSignalMapper>
FrontPage::FrontPage(Morse *parent, Ui::MainWindow *ui)

18
modes/KeyTraining.cpp

@ -2,15 +2,15 @@
#include "Morse.h"
#include "MainWindow.h"
#include <QtGui/QMenuBar>
#include <QtGui/QMessageBox>
#include <QtGui/QTextEdit>
#include <QtGui/QSpinBox>
#include <QtGui/QLabel>
#include <QtGui/QScrollArea>
#include <QtGui/QHBoxLayout>
#include <QtGui/QVBoxLayout>
#include <QtGui/QGridLayout>
#include <QMenuBar>
#include <QMessageBox>
#include <QTextEdit>
#include <QSpinBox>
#include <QLabel>
#include <QScrollArea>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QGridLayout>
#include <qdebug.h>
KeyTraining::KeyTraining(Morse *morse, Ui::MainWindow *ui)

2
modes/KeyTraining.h

@ -6,7 +6,7 @@
#include <QtCore/QTime>
#include <QtCore/QSignalMapper>
#include <QtCore/QSettings>
#include <QtGui/QBoxLayout>
#include <QBoxLayout>
#include <qaudio.h>
#include "Morse.h"

2
modes/LetterTrainingMode.cpp

@ -1,7 +1,7 @@
#include "LetterTrainingMode.h"
#include "Morse.h"
#include <QtGui/QFormLayout>
#include <QFormLayout>
#include <QtCore/QTimer>
#include <stdlib.h>

2
modes/LetterTrainingMode.h

@ -1,7 +1,7 @@
#ifndef LETTERTRAININGMODE_H
#define LETTERTRAININGMODE_H
#include <QtGui/QSpinBox>
#include <QSpinBox>
#include "TrainingMode.h"

14
modes/MorseMode.cpp

@ -2,13 +2,13 @@
#include "Morse.h"
#include "MainWindow.h"
#include <QtGui/QMenuBar>
#include <QtGui/QMessageBox>
#include <QtGui/QTextEdit>
#include <QtGui/QSpinBox>
#include <QtGui/QLabel>
#include <QtGui/QScrollArea>
#include <QtGui/QHBoxLayout>
#include <QMenuBar>
#include <QMessageBox>
#include <QTextEdit>
#include <QSpinBox>
#include <QLabel>
#include <QScrollArea>
#include <QHBoxLayout>
#include <qdebug.h>
MorseMode::MorseMode(Morse *morse, Ui::MainWindow *ui)

2
modes/MorseMode.h

@ -6,7 +6,7 @@
#include <QtCore/QTime>
#include <QtCore/QSignalMapper>
#include <QtCore/QSettings>
#include <QtGui/QBoxLayout>
#include <QBoxLayout>
#include <qaudio.h>
// #include "Morse.h"

4
modes/QModeStart.cpp

@ -1,7 +1,7 @@
#include "QModeStart.h"
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QLabel>
#include <QPushButton>
QModeStart::QModeStart(QWidget *parent, QString modeTitle) :
QDialog(parent)

2
modes/QModeStart.h

@ -2,7 +2,7 @@
#define QMODESTART_H
#include <QDialog>
#include <QtGui/QVBoxLayout>
#include <QVBoxLayout>
class QModeStart : public QDialog
{

10
modes/ReadMode.cpp

@ -1,12 +1,12 @@
#include <qdebug.h>
#include <QtGui/QFileDialog>
#include <QtGui/QMessageBox>
#include <QtGui/QFormLayout>
#include <QFileDialog>
#include <QMessageBox>
#include <QFormLayout>
#include <QtCore/QTimer>
#include <QtGui/QMenu>
#include <QMenu>
#include <QtXml/QDomDocument>
#include <QtGui/QTextDocumentFragment>
#include <QTextDocumentFragment>
#include "ReadMode.h"
#include "Morse.h"

6
modes/ReadMode.h

@ -1,9 +1,9 @@
#ifndef READMODE_H
#define READMODE_H
#include <QtGui/QTextCursor>
#include <QtGui/QTextEdit>
#include <QtGui/QSpinBox>
#include <QTextCursor>
#include <QTextEdit>
#include <QSpinBox>
#include <QtCore/QSignalMapper>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>

6
modes/SpeedTrainingMode.cpp

@ -1,7 +1,7 @@
#include <qdebug.h>
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QFormLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QFormLayout>
#include "SpeedTrainingMode.h"

2
modes/SpeedTrainingMode.h

@ -1,7 +1,7 @@
#ifndef SPEEDTRAININGMODE_H
#define SPEEDTRAININGMODE_H
#include <QtGui/QSpinBox>
#include <QSpinBox>
#include "TrainingMode.h"
#include "Morse.h"

6
modes/TrainingMode.cpp

@ -2,9 +2,9 @@
#include "Morse.h"
#include <qdebug.h>
#include <QtGui/QMenu>
#include <QtGui/QMenuBar>
#include <QtGui/QProgressBar>
#include <QMenu>
#include <QMenuBar>
#include <QProgressBar>
TrainingMode::TrainingMode(Morse *parent, Ui::MainWindow *ui)
: MorseMode(parent, ui), MSequences(),

18
modes/TrainingMode.h

@ -3,15 +3,15 @@
#include <QtCore/QSignalMapper>
#include <QtCore/QTime>
#include <QtGui/QGridLayout>
#include <QtGui/QAction>
#include <QtGui/QGridLayout>
#include <QtGui/QPushButton>
#include <QtGui/QDialogButtonBox>
#include <QtGui/QMessageBox>
#include <QtGui/QInputDialog>
#include <QtGui/QCheckBox>
#include <QtGui/QProgressBar>
#include <QGridLayout>
#include <QAction>
#include <QGridLayout>
#include <QPushButton>
#include <QDialogButtonBox>
#include <QMessageBox>
#include <QInputDialog>
#include <QCheckBox>
#include <QProgressBar>
#include "ChooseSequenceDialog.h"

2
modes/WordTrainingMode.cpp

@ -1,5 +1,5 @@
#include <qdebug.h>
#include <QtGui/QMenu>
#include <QMenu>
#include "WordTrainingMode.h"

6
modes/games/GroupGame.cpp

@ -3,9 +3,9 @@
#include "modes/games/GroupGame.h"
#include "modes/QModeStart.h"
#include <QtGui/QFormLayout>
#include <QtGui/QSpinBox>
#include <QtGui/QMenuBar>
#include <QFormLayout>
#include <QSpinBox>
#include <QMenuBar>
GroupGame::GroupGame(Morse *parent, Ui::MainWindow *ui) :
GroupingMode(parent, ui), MCountGameMode(), m_scores("Group Accuracy Game"), m_groupLengthSpinBox(0)

2
modes/games/GroupGame.h

@ -1,7 +1,7 @@
#ifndef GROUPGAMEMODE_H
#define GROUPGAMEMODE_H
#include <QtGui/QSpinBox>
#include <QSpinBox>
#include "modes/GroupingMode.h"
#include "modes/games/MCountGameMode.h"

8
modes/games/HighScoresDialog.cpp

@ -1,10 +1,10 @@
#include "HighScoresDialog.h"
#include <QtCore/QSettings>
#include <QtGui/QVBoxLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <qdebug.h>
HighScoresDialog::HighScoresDialog(const QString &tableName, QList<QPair<int,QString> > *scores, int score, int newSlot)

6
modes/games/HighScoresDialog.h

@ -1,9 +1,9 @@
#ifndef HIGHSCORESDIALOG_H
#define HIGHSCORESDIALOG_H
#include <QtGui/QDialog>
#include <QtGui/QTextEdit>
#include <QtGui/QLineEdit>
#include <QDialog>
#include <QTextEdit>
#include <QLineEdit>
#include <QtCore/QList>
#include <QtCore/QPair>

2
modes/games/Invader.cpp

@ -1,6 +1,6 @@
#include "Invader.h"
#include <QtGui/QPainter>
#include <QPainter>
Invader::Invader(QGraphicsWidget *parent, const QString &text) :
QGraphicsItem(parent), m_text(text), m_exploding(false), m_explodeSize(InvaderCircleSize)

8
modes/games/KeyInvaders.cpp

@ -1,9 +1,9 @@
#include "KeyInvaders.h"
#include <qdebug.h>
#include <QtGui/QMenu>
#include <QtGui/QGraphicsScene>
#include <QtGui/QGraphicsTextItem>
#include <QtGui/QMenuBar>
#include <QMenu>
#include <QGraphicsScene>
#include <QGraphicsTextItem>
#include <QMenuBar>
KeyInvaders::KeyInvaders(Morse *parent, Ui::MainWindow *main)
: MorseMode(parent, main), MGameMode(), MSequences(), KeyingReader(),

2
modes/games/KeyInvaders.h

@ -11,7 +11,7 @@
#include <QtCore/QList>
#include <QtCore/QList>
#include <QtCore/QTime>
#include <QtGui/QGraphicsView>
#include <QGraphicsView>
#include <QtCore/QTimer>
#include "Invader.h"

2
modes/games/MGameMode.h

@ -2,7 +2,7 @@
#define GAMEMODE_H
#include <QtCore/QObject>
#include <QtGui/QLabel>
#include <QLabel>
class MGameMode
{

8
modes/games/WordGame.cpp

@ -3,10 +3,10 @@
#include "modes/games/WordGame.h"
#include "modes/QModeStart.h"
#include <QtGui/QMenuBar>
#include <QtGui/QFormLayout>
#include <QtGui/QVBoxLayout>
#include <QtGui/QSpinBox>
#include <QMenuBar>
#include <QFormLayout>
#include <QVBoxLayout>
#include <QSpinBox>
WordGame::WordGame(Morse *parent, Ui::MainWindow *ui) :
WordTrainingMode(parent, ui), MCountGameMode(), m_scores("Word Accuracy Game")

22
ui_MainWindow.h

@ -2,17 +2,17 @@
#define UI_MAINWINDOW_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QMainWindow>
#include <QtGui/QPushButton>
#include <QtGui/QSpacerItem>
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QMainWindow>
#include <QPushButton>
#include <QSpacerItem>
#include <QVBoxLayout>
#include <QWidget>
QT_BEGIN_NAMESPACE

4
widgets/KeyTimingDisplay.cpp

@ -1,7 +1,7 @@
#include "KeyTimingDisplay.h"
#include <QtGui/QPainter>
#include <QtGui/QPolygon>
#include <QPainter>
#include <QPolygon>
#include <qdebug.h>
KeyTimingDisplay::KeyTimingDisplay(QWidget *parent) :

Loading…
Cancel
Save