Skip to content

Commit

Permalink
Use forward declaration for moc generated classes
Browse files Browse the repository at this point in the history
  • Loading branch information
bear101 committed May 10, 2023
1 parent abd92db commit dd54ff8
Show file tree
Hide file tree
Showing 6 changed files with 1,442 additions and 1,420 deletions.
1,282 changes: 642 additions & 640 deletions Client/qtTeamTalk/mainwindow.cpp

Large diffs are not rendered by default.

19 changes: 13 additions & 6 deletions Client/qtTeamTalk/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,22 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H

#include "ui_mainwindow.h"

#include <QLabel>
#include <QMainWindow>
#include <QMap>
#include <QSet>
#include <QQueue>
#include <QSystemTrayIcon>
#include <QNetworkAccessManager>
#include <QProgressBar>
#include <QQueue>
#include <QSet>
#include <QSortFilterProxyModel>
#include <QSystemTrayIcon>

#if defined(Q_OS_DARWIN) //For hotkeys on Mac
#include <Carbon/Carbon.h>
#endif

#include <memory>

#include "common.h"
#include "textmessagecontainer.h"
#include "utilsound.h"
Expand Down Expand Up @@ -90,6 +93,10 @@ enum
TAB_COUNT
};

QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
QT_END_NAMESPACE

class MainWindow : public QMainWindow
{
Q_OBJECT
Expand Down Expand Up @@ -124,7 +131,7 @@ class MainWindow : public QMainWindow
#endif
#endif
private:
Ui::MainWindow ui;
std::unique_ptr<Ui::MainWindow> ui;
class FilesModel* m_filesmodel;
QSortFilterProxyModel* m_proxyFilesModel;
QSystemTrayIcon* m_sysicon;
Expand Down
Loading

0 comments on commit dd54ff8

Please sign in to comment.