Commit 9b2e9731 authored by Gustavo Carneiro's avatar Gustavo Carneiro Committed by Tomaz Canabrava

move Session files to a new folder.

parent ac96ed4c
......@@ -34,10 +34,10 @@
#include <KLocalizedString>
// Konsole
#include "SessionManager.h"
#include "session/SessionManager.h"
#include "ProfileManager.h"
#include "MainWindow.h"
#include "Session.h"
#include "session/Session.h"
#include "ShellCommand.h"
#include "KonsoleSettings.h"
#include "ViewManager.h"
......
......@@ -37,12 +37,12 @@ option(KONSOLE_BUILD_UNI2CHARACTERWIDTH "Konsole: build uni2characterwidth execu
# qdbuscpp2xml -M -s ViewManager.h -o org.kde.konsole.Konsole.xml
# Generate dbus .xml files; do not store .xml in source folder
qt5_generate_dbus_interface(Session.h org.kde.konsole.Session.xml OPTIONS -m)
qt5_generate_dbus_interface(session/Session.h org.kde.konsole.Session.xml OPTIONS -m)
qt5_generate_dbus_interface(ViewManager.h org.kde.konsole.Window.xml OPTIONS -m)
qt5_add_dbus_adaptor(sessionadaptors_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
Session.h
session/Session.h
Konsole::Session)
qt5_add_dbus_adaptor(windowadaptors_SRCS
${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml
......@@ -84,12 +84,12 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
Screen.cpp
ScreenWindow.cpp
ScrollState.cpp
Session.cpp
SessionGroup.cpp
SessionController.cpp
SessionManager.cpp
SessionListModel.cpp
SessionTask.cpp
session/Session.cpp
session/SessionGroup.cpp
session/SessionController.cpp
session/SessionManager.cpp
session/SessionListModel.cpp
session/SessionTask.cpp
ShellCommand.cpp
widgets/TabTitleFormatButton.cpp
TerminalCharacterDecoder.cpp
......
......@@ -28,9 +28,9 @@
#include <QDialog>
// Konsole
#include "SessionManager.h"
#include "Session.h"
#include "SessionListModel.h"
#include "session/SessionManager.h"
#include "session/Session.h"
#include "session/SessionListModel.h"
namespace Ui {
class CopyInputDialog;
......
......@@ -26,8 +26,8 @@
// Konsole
#include "widgets/TerminalDisplay.h"
#include "SessionManager.h"
#include "Session.h"
#include "session/SessionManager.h"
#include "session/Session.h"
#include "Screen.h"
using namespace Konsole;
......
......@@ -50,10 +50,10 @@
#include <KIO/PreviewJob>
// Konsole
#include "Session.h"
#include "session/Session.h"
#include "TerminalCharacterDecoder.h"
#include "ProfileManager.h"
#include "SessionManager.h"
#include "session/SessionManager.h"
using namespace Konsole;
......
......@@ -43,12 +43,12 @@
// Konsole
#include "BookmarkHandler.h"
#include "SessionController.h"
#include "session/SessionController.h"
#include "ProfileList.h"
#include "Session.h"
#include "session/Session.h"
#include "widgets/ViewContainer.h"
#include "ViewManager.h"
#include "SessionManager.h"
#include "session/SessionManager.h"
#include "ProfileManager.h"
#include "KonsoleSettings.h"
#include "WindowSystemInfo.h"
......
......@@ -37,9 +37,9 @@
// Konsole
#include "EditProfileDialog.h"
#include "Emulation.h"
#include "Session.h"
#include "SessionController.h"
#include "SessionManager.h"
#include "session/Session.h"
#include "session/SessionController.h"
#include "session/SessionManager.h"
#include "ProfileManager.h"
#include "widgets/TerminalDisplay.h"
#include "ViewManager.h"
......
......@@ -28,7 +28,7 @@
#include <QVariantList>
// Konsole
#include "Session.h"
#include "session/Session.h"
#include "config-konsole.h"
class QStringList;
......
......@@ -30,7 +30,7 @@
#include <KConfig>
#include <KConfigGroup>
#include "SessionManager.h"
#include "session/SessionManager.h"
#include "Emulation.h"
namespace Konsole {
......
......@@ -21,7 +21,7 @@
#ifndef SAVEHISTORYTASK_H
#define SAVEHISTORYTASK_H
#include "SessionTask.h"
#include "session/SessionTask.h"
#include "TerminalCharacterDecoder.h"
#include <kio/job.h>
......
......@@ -25,10 +25,10 @@
#include <QMap>
#include <QRegularExpression>
#include "SessionTask.h"
#include "session/SessionTask.h"
#include "Enumeration.h"
#include "ScreenWindow.h"
#include "Session.h"
#include "session/Session.h"
namespace Konsole
{
......
......@@ -36,10 +36,10 @@
#include "ColorScheme.h"
#include "ColorSchemeManager.h"
#include "Session.h"
#include "session/Session.h"
#include "widgets/TerminalDisplay.h"
#include "SessionController.h"
#include "SessionManager.h"
#include "session/SessionController.h"
#include "session/SessionManager.h"
#include "ProfileManager.h"
#include "widgets/ViewSplitter.h"
#include "widgets/ViewContainer.h"
......
......@@ -29,7 +29,7 @@
// Konsole
#include "konsoleprivate_export.h"
#include "Session.h"
#include "session/Session.h"
namespace Konsole {
/**
......
......@@ -37,7 +37,7 @@
// Konsole
#include "KeyboardTranslator.h"
#include "SessionController.h"
#include "session/SessionController.h"
#include "widgets/TerminalDisplay.h"
using Konsole::Vt102Emulation;
......
......@@ -19,7 +19,7 @@
// Own
#include "DBusTest.h"
#include "../Session.h"
#include "../session/Session.h"
#include "../Profile.h"
#include "../ProfileWriter.h"
......
......@@ -23,7 +23,7 @@
#include "qtest.h"
// Konsole
#include "../Session.h"
#include "../session/Session.h"
#include "../Emulation.h"
#include "../History.h"
......
......@@ -18,7 +18,7 @@
*/
// Own
#include "SessionManagerTest.h"
#include "session/SessionManagerTest.h"
// KDE
#include <qtest.h>
......
......@@ -23,7 +23,7 @@
#include "qtest.h"
// Konsole
#include "../Session.h"
#include "../session/Session.h"
#include "../Emulation.h"
#include "../History.h"
......
......@@ -22,7 +22,7 @@
*/
// Own
#include "Session.h"
#include "session/Session.h"
// Standard
#include <cstdlib>
......@@ -57,7 +57,7 @@
#include "ZModemDialog.h"
#include "History.h"
#include "konsoledebug.h"
#include "SessionManager.h"
#include "session/SessionManager.h"
#include "ProfileManager.h"
#include "Profile.h"
......
......@@ -19,7 +19,7 @@
*/
// Own
#include "SessionController.h"
#include "session/SessionController.h"
#include "ProfileManager.h"
#include "konsoledebug.h"
......@@ -68,15 +68,15 @@
#include "widgets/IncrementalSearchBar.h"
#include "RenameTabDialog.h"
#include "ScreenWindow.h"
#include "Session.h"
#include "session/Session.h"
#include "ProfileList.h"
#include "widgets/TerminalDisplay.h"
#include "SessionManager.h"
#include "session/SessionManager.h"
#include "Enumeration.h"
#include "PrintOptions.h"
#include "SaveHistoryTask.h"
#include "SearchHistoryTask.h"
#include "SessionGroup.h"
#include "session/SessionGroup.h"
// For Unix signal names
#include <csignal>
......
......@@ -34,7 +34,7 @@
#include "ViewProperties.h"
#include "Profile.h"
#include "Enumeration.h"
#include "Session.h"
#include "session/Session.h"
class QAction;
class QTextCodec;
......
......@@ -22,8 +22,8 @@
*/
// Konsole
#include "Session.h"
#include "SessionGroup.h"
#include "session/Session.h"
#include "session/SessionGroup.h"
#include "Emulation.h"
namespace Konsole {
......
......@@ -20,7 +20,7 @@
*/
// Own
#include "SessionListModel.h"
#include "session/SessionListModel.h"
// KDE
#include <KLocalizedString>
......@@ -28,7 +28,7 @@
#include <QIcon>
// Konsole
#include "Session.h"
#include "session/Session.h"
using Konsole::Session;
using Konsole::SessionListModel;
......
......@@ -20,7 +20,7 @@
*/
// Own
#include "SessionManager.h"
#include "session/SessionManager.h"
#include "konsoledebug.h"
......@@ -33,7 +33,7 @@
#include <KConfigGroup>
// Konsole
#include "Session.h"
#include "session/Session.h"
#include "ProfileManager.h"
#include "History.h"
#include "Enumeration.h"
......
......@@ -18,7 +18,7 @@
02110-1301 USA.
*/
#include "SessionTask.h"
#include "session/SessionTask.h"
namespace Konsole
{
......
......@@ -25,7 +25,7 @@
#include <QList>
#include <QPointer>
#include "Session.h"
#include "session/Session.h"
namespace Konsole {
......
......@@ -29,10 +29,10 @@
// Konsole
#include "EditProfileDialog.h"
#include "ProfileManager.h"
#include "Session.h"
#include "session/Session.h"
#include "widgets/TerminalDisplay.h"
#include "SessionManager.h"
#include "SessionController.h"
#include "session/SessionManager.h"
#include "session/SessionController.h"
using namespace Konsole;
......
......@@ -40,7 +40,7 @@
// Konsole
#include "../Pty.h"
#include "../Session.h"
#include "../session/Session.h"
#include "../KeyboardTranslator.h"
using namespace Konsole;
......
......@@ -25,7 +25,7 @@
#include <QAction>
// Konsole
#include "Session.h"
#include "session/Session.h"
namespace Konsole {
class TabTitleFormatButton : public QPushButton
......
......@@ -65,11 +65,11 @@
#include "konsoledebug.h"
#include "TerminalCharacterDecoder.h"
#include "Screen.h"
#include "SessionController.h"
#include "session/SessionController.h"
#include "ExtendedCharTable.h"
#include "TerminalDisplayAccessible.h"
#include "SessionManager.h"
#include "Session.h"
#include "session/SessionManager.h"
#include "session/Session.h"
#include "WindowSystemInfo.h"
#include "widgets/IncrementalSearchBar.h"
#include "Profile.h"
......
......@@ -20,7 +20,7 @@
*/
#include "TerminalDisplayAccessible.h"
#include "SessionController.h"
#include "session/SessionController.h"
#include <klocalizedstring.h>
using namespace Konsole;
......
......@@ -22,7 +22,7 @@
#include "TerminalHeaderBar.h"
#include "widgets/TerminalDisplay.h"
#include "SessionController.h"
#include "session/SessionController.h"
#include "ViewProperties.h"
#include "KonsoleSettings.h"
#include "widgets/ViewSplitter.h"
......
......@@ -24,7 +24,7 @@
#include <QWidget>
#include <QPoint>
#include "Session.h"
#include "session/Session.h"
class QLabel;
class QToolButton;
......
......@@ -41,12 +41,12 @@
#include "ProfileList.h"
#include "ViewManager.h"
#include "KonsoleSettings.h"
#include "SessionController.h"
#include "session/SessionController.h"
#include "DetachableTabBar.h"
#include "widgets/TerminalDisplay.h"
#include "widgets/ViewSplitter.h"
#include "MainWindow.h"
#include "Session.h"
#include "session/Session.h"
// TODO Perhaps move everything which is Konsole-specific into different files
......
......@@ -29,7 +29,7 @@
// Konsole
#include "Profile.h"
#include "ViewManager.h"
#include "Session.h"
#include "session/Session.h"
// Qt
class QPoint;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment