Skip to content

Commit 2d2ef5f

Browse files
hlukhluk
committed
Split common.h header
1 parent 5636753 commit 2d2ef5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+314
-126
lines changed

‎plugins/itemdata/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(copyq_plugin_itemdata_SOURCES
22
../../src/common/common.cpp
3+
../../src/common/log.cpp
4+
../../src/common/mimetypes.cpp
35
)
46

57
copyq_add_plugin(itemdata)

‎plugins/itemdata/itemdata.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "ui_itemdatasettings.h"
2222

2323
#include "common/common.h"
24+
#include "common/mimetypes.h"
2425
#include "common/contenttype.h"
2526

2627
#include <QContextMenuEvent>

‎plugins/itemdata/itemdata.pro

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
include(../plugins_common.pri)
22

33
HEADERS += itemdata.h
4-
SOURCES += itemdata.cpp
5-
SOURCES += ../../src/common/common.cpp
4+
SOURCES += itemdata.cpp \
5+
../../src/common/common.cpp \
6+
../../src/common/log.cpp \
7+
../../src/common/mimetypes.cpp
68
FORMS += itemdatasettings.ui
79
TARGET = $$qtLibraryTarget(itemdata)
810

‎plugins/itemencrypted/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
set(copyq_plugin_itemencrypted_SOURCES
22
../../src/common/common.cpp
3+
../../src/common/log.cpp
4+
../../src/common/mimetypes.cpp
35
../../src/gui/iconfont.cpp
46
../../src/gui/iconwidget.cpp
57
../../src/item/encrypt.cpp

‎plugins/itemencrypted/itemencrypted.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include "common/common.h"
2424
#include "common/contenttype.h"
25+
#include "common/mimetypes.h"
2526
#include "gui/icons.h"
2627
#include "gui/iconwidget.h"
2728
#include "item/encrypt.h"

‎plugins/itemencrypted/itemencrypted.pro

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ HEADERS += itemencrypted.h \
55
SOURCES += itemencrypted.cpp
66
SOURCES += \
77
../../src/common/common.cpp \
8+
../../src/common/log.cpp \
9+
../../src/common/mimetypes.cpp \
810
../../src/gui/iconfont.cpp \
911
../../src/gui/iconwidget.cpp \
1012
../../src/item/encrypt.cpp \

‎plugins/itemimage/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(copyq_plugin_itemimage_SOURCES
2-
../../src/common/common.cpp
2+
../../src/common/mimetypes.cpp
33
../../src/item/itemeditor.cpp
44
)
55

‎plugins/itemimage/itemimage.pro

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
include(../plugins_common.pri)
22

33
HEADERS += itemimage.h
4-
SOURCES += itemimage.cpp
5-
SOURCES += ../../src/common/common.cpp
4+
SOURCES += itemimage.cpp \
5+
../../src/common/mimetypes.cpp
66
FORMS += itemimagesettings.ui
77
TARGET = $$qtLibraryTarget(itemimage)
88

‎plugins/itemsync/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(copyq_plugin_itemsync_SOURCES
2-
../../src/common/common.cpp
2+
../../src/common/log.cpp
3+
../../src/common/mimetypes.cpp
34
../../src/gui/iconfont.cpp
45
../../src/gui/iconselectbutton.cpp
56
../../src/gui/iconwidget.cpp

‎plugins/itemsync/itemsync.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
#include "itemsync.h"
2121
#include "ui_itemsyncsettings.h"
2222

23-
#include "common/common.h"
23+
#include "common/log.h"
24+
#include "common/mimetypes.h"
2425
#include "common/contenttype.h"
2526
#include "gui/iconselectbutton.h"
2627
#include "gui/icons.h"

‎plugins/itemsync/itemsync.pro

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ HEADERS += itemsync.h \
55
../../src/gui/iconwidget.h
66
SOURCES += itemsync.cpp
77
SOURCES += \
8-
../../src/common/common.cpp \
8+
../../src/common/log.cpp \
9+
../../src/common/mimetypes.cpp \
910
../../src/gui/iconfont.cpp \
1011
../../src/gui/iconselectbutton.cpp \
1112
../../src/gui/iconwidget.cpp \

‎plugins/itemsync/tests/itemsynctests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "itemsynctests.h"
2121

22-
#include "common/common.h"
22+
#include "common/mimetypes.h"
2323

2424
#include <QDir>
2525
#include <QFile>

‎src/app/app.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "app.h"
2121

22-
#include "common/common.h"
22+
#include "common/log.h"
2323
#include "platform/platformnativeinterface.h"
2424
#ifdef Q_OS_UNIX
2525
# include "platform/unix/unixsignalhandler.h"

‎src/app/clipboardclient.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121

2222
#include "common/arguments.h"
2323
#include "common/client_server.h"
24-
#include "common/common.h"
24+
#include "common/commandstatus.h"
25+
#include "common/log.h"
2526
#include "platform/platformnativeinterface.h"
2627
#include "platform/platformwindow.h"
2728

‎src/app/clipboardmonitor.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
#include "common/arguments.h"
2323
#include "common/client_server.h"
2424
#include "common/common.h"
25+
#include "common/mimetypes.h"
26+
#include "common/monitormessagecode.h"
2527
#include "item/clipboarditem.h"
2628
#include "item/serialize.h"
2729
#include "platform/platformnativeinterface.h"

‎src/app/clipboardmonitor.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@
2323
#include "app.h"
2424
#include "client.h"
2525

26-
#include "common/common.h"
26+
#include "common/log.h"
2727

2828
#include <QClipboard>
2929
#include <QScopedPointer>
3030
#include <QStringList>
31+
#include <QVariantMap>
3132

3233
class QMimeData;
3334
class QTimer;

‎src/app/clipboardserver.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include "common/arguments.h"
2424
#include "common/clientsocket.h"
2525
#include "common/client_server.h"
26+
#include "common/mimetypes.h"
27+
#include "common/monitormessagecode.h"
2628
#include "gui/clipboardbrowser.h"
2729
#include "gui/configtabshortcuts.h"
2830
#include "gui/configurationmanager.h"

‎src/app/remoteprocess.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
#include "common/arguments.h"
2323
#include "common/client_server.h"
2424
#include "common/clientsocket.h"
25-
#include "common/common.h"
25+
#include "common/monitormessagecode.h"
26+
#include "common/log.h"
2627
#include "common/server.h"
2728

2829
#include <QCoreApplication>

‎src/common/clientsocket.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "common/arguments.h"
2323
#include "common/client_server.h"
24-
#include "common/common.h"
24+
#include "common/log.h"
2525

2626
#define SOCKET_LOG(text) \
2727
COPYQ_LOG( QString("%1: %2").arg(property("id").toInt()).arg(text) )

‎src/common/commandstatus.h

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/*
2+
Copyright (c) 2014, Lukas Holecek <[email protected]>
3+
4+
This file is part of CopyQ.
5+
6+
CopyQ is free software: you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation, either version 3 of the License, or
9+
(at your option) any later version.
10+
11+
CopyQ is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
GNU General Public License for more details.
15+
16+
You should have received a copy of the GNU General Public License
17+
along with CopyQ. If not, see <http://www.gnu.org/licenses/>.
18+
*/
19+
20+
#ifndef COMMANDSTATUS_H
21+
#define COMMANDSTATUS_H
22+
23+
/** Command status. */
24+
enum CommandStatus {
25+
/** Script finished */
26+
CommandFinished = 0,
27+
/** Command invocation error. */
28+
CommandError = 1,
29+
/** Bad command syntax. */
30+
CommandBadSyntax = 2,
31+
/** Command successfully invoked. */
32+
CommandSuccess,
33+
/** Activate window */
34+
CommandActivateWindow,
35+
/** Ask client to send data from its stdin. */
36+
CommandReadInput
37+
};
38+
39+
#endif // COMMANDSTATUS_H

‎src/common/common.cpp

+4-40
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@
1717
along with CopyQ. If not, see <http://www.gnu.org/licenses/>.
1818
*/
1919

20-
#include "common.h"
20+
#include "common/common.h"
21+
22+
#include "common/log.h"
23+
#include "common/mimetypes.h"
2124

2225
#include <QAction>
2326
#include <QApplication>
2427
#include <QClipboard>
25-
#include <QFile>
2628
#include <QLocale>
2729
#include <QMimeData>
2830
#include <QObject>
@@ -32,17 +34,6 @@
3234
# include <QTextDocument> // Qt::escape()
3335
#endif
3436

35-
const char mimeText[] = "text/plain";
36-
const char mimeHtml[] = "text/html";
37-
const char mimeUriList[] = "text/uri-list";
38-
const char mimeWindowTitle[] = MIME_PREFIX "owner-window-title";
39-
const char mimeItems[] = MIME_PREFIX "item";
40-
const char mimeItemNotes[] = MIME_PREFIX "item-notes";
41-
const char mimeOwner[] = MIME_PREFIX "owner";
42-
#ifdef COPYQ_WS_X11
43-
const char mimeClipboardMode[] = MIME_PREFIX "clipboard-mode";
44-
#endif
45-
4637
QString quoteString(const QString &str)
4738
{
4839
#if QT_VERSION >= 0x040800
@@ -61,33 +52,6 @@ QString escapeHtml(const QString &str)
6152
#endif
6253
}
6354

64-
QString createLogMessage(const QString &label, const QString &text, const LogLevel level)
65-
{
66-
QString levelId;
67-
68-
if (level == LogNote)
69-
levelId = QString("%1");
70-
else if (level == LogWarning)
71-
levelId = QObject::tr("warning: %1");
72-
else if (level == LogError)
73-
levelId = QObject::tr("ERROR: %1");
74-
#ifdef COPYQ_LOG_DEBUG
75-
else if (level == LogDebug)
76-
levelId = QString("DEBUG: %1");
77-
#endif
78-
79-
return label + " " + levelId.arg(text) + "\n";
80-
}
81-
82-
void log(const QString &text, const LogLevel level)
83-
{
84-
const QString msg = createLogMessage("CopyQ", text, level);
85-
86-
QFile f;
87-
f.open(stderr, QIODevice::WriteOnly);
88-
f.write( msg.toLocal8Bit() );
89-
}
90-
9155
bool isMainThread()
9256
{
9357
return QThread::currentThread() == QApplication::instance()->thread();

‎src/common/common.h

-64
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,6 @@ class QMimeData;
3636
class QString;
3737
class QStringList;
3838

39-
/** Command status. */
40-
enum CommandStatus {
41-
/** Script finished */
42-
CommandFinished = 0,
43-
/** Command invocation error. */
44-
CommandError = 1,
45-
/** Bad command syntax. */
46-
CommandBadSyntax = 2,
47-
/** Command successfully invoked. */
48-
CommandSuccess,
49-
/** Activate window */
50-
CommandActivateWindow,
51-
/** Ask client to send data from its stdin. */
52-
CommandReadInput
53-
};
54-
55-
/** Message code for/from clipboard monitor. */
56-
enum MonitorMessageCode {
57-
MonitorPing,
58-
MonitorPong,
59-
MonitorSettings,
60-
MonitorChangeClipboard,
61-
MonitorClipboardChanged,
62-
MonitorLog
63-
};
64-
6539
#if QT_VERSION < 0x050000
6640
# ifdef Q_WS_WIN
6741
# define Q_OS_WIN
@@ -74,48 +48,10 @@ enum MonitorMessageCode {
7448
# define NO_GLOBAL_SHORTCUTS
7549
#endif
7650

77-
#ifdef COPYQ_LOG_DEBUG
78-
inline bool isLogVerbose()
79-
{
80-
static const bool verbose = qgetenv("COPYQ_VERBOSE") == "1";
81-
return verbose;
82-
}
83-
# define COPYQ_LOG(msg) log(msg, LogDebug)
84-
# define COPYQ_LOG_VERBOSE(msg) do { if ( isLogVerbose() ) log(msg, LogDebug); } while (false)
85-
#else
86-
# define COPYQ_LOG(msg)
87-
# define COPYQ_LOG_VERBOSE(msg)
88-
#endif
89-
90-
enum LogLevel {
91-
#ifdef COPYQ_LOG_DEBUG
92-
LogDebug,
93-
#endif
94-
LogNote,
95-
LogWarning,
96-
LogError
97-
};
98-
99-
#define MIME_PREFIX "application/x-copyq-"
100-
extern const char mimeText[];
101-
extern const char mimeHtml[];
102-
extern const char mimeUriList[];
103-
extern const char mimeWindowTitle[];
104-
extern const char mimeItems[];
105-
extern const char mimeItemNotes[];
106-
extern const char mimeOwner[];
107-
#ifdef COPYQ_WS_X11
108-
extern const char mimeClipboardMode[];
109-
#endif
110-
11151
QString quoteString(const QString &str);
11252

11353
QString escapeHtml(const QString &str);
11454

115-
QString createLogMessage(const QString &label, const QString &text, const LogLevel level);
116-
117-
void log(const QString &text, const LogLevel level = LogNote);
118-
11955
bool isMainThread();
12056

12157
const QMimeData *clipboardData(QClipboard::Mode mode = QClipboard::Clipboard);

0 commit comments

Comments
 (0)