Switched the method of how the Designer UI file is used in the MainWindow class to "The Single Inheritance Approach" (with "Using a Pointer Member Variable"). This is the method which Qt recommends for large projects.

This commit is contained in:
LoRd_MuldeR 2012-12-04 01:35:48 +01:00
parent 1d960d5da6
commit 7077650bb6
9 changed files with 618 additions and 612 deletions

View File

@ -1,6 +1,7 @@
// Microsoft Visual C++ generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "src\Resource.h" #include "src/Resource.h"
#include "src/Config.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 7 #define VER_LAMEXP_MINOR_LO 7
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 5 #define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 1201 #define VER_LAMEXP_BUILD 1204
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

File diff suppressed because it is too large Load Diff

View File

@ -21,23 +21,32 @@
#pragma once #pragma once
#include "../tmp/UIC_MainWindow.h" #include <QMainWindow>
//Class declarations //Class declarations
class QFileSystemModelEx;
class WorkingBanner;
class MessageHandlerThread;
class AudioFileModel;
class MetaInfoModel;
class SettingsModel;
class QButtonGroup;
class FileListModel;
class AbstractEncoder; class AbstractEncoder;
class QMenu; class AudioFileModel;
class DropBox;
class CustomEventFilter; class CustomEventFilter;
class DropBox;
class FileListModel;
class MessageHandlerThread;
class MetaInfoModel;
class QActionGroup;
class QButtonGroup;
class QFileSystemModelEx;
class QLabel;
class QMenu;
class QModelIndex;
class SettingsModel;
class WorkingBanner;
class MainWindow: public QMainWindow, private Ui::MainWindow //UIC forward declartion
namespace Ui {
class MainWindow;
}
//MainWindow class
class MainWindow: public QMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -169,6 +178,8 @@ protected:
virtual bool winEvent(MSG *message, long *result); virtual bool winEvent(MSG *message, long *result);
private: private:
Ui::MainWindow *ui; //for Qt UIC
void addFiles(const QStringList &files); void addFiles(const QStringList &files);
void addFolder(const QString &path, bool recursive = false, bool delayed = false); void addFolder(const QString &path, bool recursive = false, bool delayed = false);
bool checkForUpdates(void); bool checkForUpdates(void);

View File

@ -282,8 +282,6 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
ProcessingDialog::~ProcessingDialog(void) ProcessingDialog::~ProcessingDialog(void)
{ {
fprintf(stderr, "BUMP 1\n"); fflush(stderr);
view_log->setModel(NULL); view_log->setModel(NULL);
if(m_progressIndicator) if(m_progressIndicator)
@ -319,8 +317,6 @@ ProcessingDialog::~ProcessingDialog(void)
} }
} }
fprintf(stderr, "BUMP 2\n"); fflush(stderr);
while(!m_threadList.isEmpty()) while(!m_threadList.isEmpty())
{ {
ProcessThread *thread = m_threadList.takeFirst(); ProcessThread *thread = m_threadList.takeFirst();
@ -329,8 +325,6 @@ ProcessingDialog::~ProcessingDialog(void)
delete thread; delete thread;
} }
fprintf(stderr, "BUMP 3\n"); fflush(stderr);
LAMEXP_DELETE(m_progressIndicator); LAMEXP_DELETE(m_progressIndicator);
LAMEXP_DELETE(m_systemTray); LAMEXP_DELETE(m_systemTray);
LAMEXP_DELETE(m_diskObserver); LAMEXP_DELETE(m_diskObserver);
@ -342,12 +336,8 @@ ProcessingDialog::~ProcessingDialog(void)
LAMEXP_DELETE(m_contextMenu); LAMEXP_DELETE(m_contextMenu);
LAMEXP_DELETE(m_progressModel); LAMEXP_DELETE(m_progressModel);
fprintf(stderr, "BUMP 4\n"); fflush(stderr);
WinSevenTaskbar::setOverlayIcon(this, NULL); WinSevenTaskbar::setOverlayIcon(this, NULL);
WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState); WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState);
fprintf(stderr, "BUMP 5\n"); fflush(stderr);
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

View File

@ -51,6 +51,7 @@
//LameXP includes //LameXP includes
#include "Resource.h" #include "Resource.h"
#include "Config.h"
#include "LockedFile.h" #include "LockedFile.h"
//CRT includes //CRT includes

View File

@ -19,8 +19,6 @@
// http://www.gnu.org/licenses/gpl-2.0.txt // http://www.gnu.org/licenses/gpl-2.0.txt
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include "Config.h"
/* /*
* Resource ID's * Resource ID's
*/ */

View File

@ -747,7 +747,7 @@ void InitializationThread::selfTest(void)
qDebug("%02i -> %s", ++n, g_lamexp_tools[i].pcName); qDebug("%02i -> %s", ++n, g_lamexp_tools[i].pcName);
} }
} }
if(n != 28) if(n != 27)
{ {
qFatal("Tool count mismatch !!!"); qFatal("Tool count mismatch !!!");
} }

View File

@ -2,15 +2,15 @@
// qtmain_win.cpp // qtmain_win.cpp
// ========================================================================== // ==========================================================================
// //
// This source file is included from Qt v4.8.3, because VS2012 won't link // This source file is included from Qt v4.8.4, because VS2012 won't link
// with the 'qtmain.lib' from the official Qt v4.8.3 (VS2010) release. // with the 'qtmain.lib' from the official Qt v4.8.4 (VS2010) release.
// //
// ========================================================================== // ==========================================================================
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/ ** Contact: http://www.qt-project.org/legal
** **
** This file is part of the Windows main function of the Qt Toolkit. ** This file is part of the Windows main function of the Qt Toolkit.
** **
@ -26,10 +26,10 @@
** notice, this list of conditions and the following disclaimer in ** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the ** the documentation and/or other materials provided with the
** distribution. ** distribution.
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
** the names of its contributors may be used to endorse or promote ** of its contributors may be used to endorse or promote products derived
** products derived from this software without specific prior written ** from this software without specific prior written permission.
** permission. **
** **
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@ -48,10 +48,9 @@
****************************************************************************/ ****************************************************************************/
#include "qt_windows.h" #include "qt_windows.h"
#include "qbytearray.h"
#include <QByteArray> #include "qstring.h"
#include <QString> #include "qvector.h"
#include <QVector>
/* /*
This file contains the code in the qtmain library for Windows. This file contains the code in the qtmain library for Windows.