Mercurial > hg > octave-avbm
changeset 15653:35c891dce299
Removed INCLUDEPATH.
line wrap: on
line diff
--- a/libqterminal/libqterminal.pro +++ b/libqterminal/libqterminal.pro @@ -12,7 +12,6 @@ DEFINES += HAVE_POSIX_OPENPT #or DEFINES += HAVE_GETPT -INCLUDEPATH += unix HEADERS = unix/BlockArray.h \ unix/Character.h \ unix/CharacterColor.h \ @@ -52,7 +51,6 @@ } win32 { -INCLUDEPATH += win32 HEADERS = win32/QTerminalColors.h \ win32/QWinTerminalImpl.h
--- a/libqterminal/unix/BlockArray.cpp +++ b/libqterminal/unix/BlockArray.cpp @@ -22,7 +22,7 @@ */ // Own -#include "BlockArray.h" +#include "unix/BlockArray.h" #include <QtCore>
--- a/libqterminal/unix/Character.h +++ b/libqterminal/unix/Character.h @@ -29,7 +29,7 @@ #include <QtCore/QHash> // Local -#include "CharacterColor.h" +#include "unix/CharacterColor.h" typedef unsigned char LineProperty;
--- a/libqterminal/unix/Emulation.cpp +++ b/libqterminal/unix/Emulation.cpp @@ -24,7 +24,7 @@ */ // Own -#include "Emulation.h" +#include "unix/Emulation.h" // System #include <assert.h> @@ -44,10 +44,10 @@ #include <QtCore/QTime> // Konsole -#include "KeyboardTranslator.h" -#include "Screen.h" -#include "TerminalCharacterDecoder.h" -#include "ScreenWindow.h" +#include "unix/KeyboardTranslator.h" +#include "unix/Screen.h" +#include "unix/TerminalCharacterDecoder.h" +#include "unix/ScreenWindow.h" Emulation::Emulation() : _currentScreen(0),
--- a/libqterminal/unix/Filter.cpp +++ b/libqterminal/unix/Filter.cpp @@ -20,7 +20,7 @@ */ // Own -#include "Filter.h" +#include "unix/Filter.h" // System #include <iostream> @@ -35,7 +35,7 @@ #include <QtCore> // Konsole -#include "TerminalCharacterDecoder.h" +#include "unix/TerminalCharacterDecoder.h" FilterChain::~FilterChain() {
--- a/libqterminal/unix/Filter.h +++ b/libqterminal/unix/Filter.h @@ -31,7 +31,7 @@ #include <QtCore/QRegExp> // Local -#include "Character.h" +#include "unix/Character.h" /** * A filter processes blocks of text looking for certain patterns (such as URLs or keywords from a list)
--- a/libqterminal/unix/History.cpp +++ b/libqterminal/unix/History.cpp @@ -21,7 +21,7 @@ */ // Own -#include "History.h" +#include "unix/History.h" // System #include <iostream>
--- a/libqterminal/unix/History.h +++ b/libqterminal/unix/History.h @@ -29,8 +29,8 @@ #include <QtCore> // Konsole -#include "BlockArray.h" -#include "Character.h" +#include "unix/BlockArray.h" +#include "unix/Character.h" class HistoryFile
--- a/libqterminal/unix/KeyboardTranslator.cpp +++ b/libqterminal/unix/KeyboardTranslator.cpp @@ -22,7 +22,7 @@ */ // Own -#include "KeyboardTranslator.h" +#include "unix/KeyboardTranslator.h" // System #include <ctype.h>
--- a/libqterminal/unix/QUnixTerminalImpl.cpp +++ b/libqterminal/unix/QUnixTerminalImpl.cpp @@ -19,8 +19,8 @@ #include <QDebug> -#include "QUnixTerminalImpl.h" -#include "kpty.h" +#include "unix/QUnixTerminalImpl.h" +#include "unix/kpty.h" #include <termios.h>
--- a/libqterminal/unix/QUnixTerminalImpl.h +++ b/libqterminal/unix/QUnixTerminalImpl.h @@ -22,9 +22,9 @@ #define Q_TERMINAL #include <QtGui> -#include "kpty.h" -#include "TerminalModel.h" -#include "TerminalView.h" +#include "unix/kpty.h" +#include "unix/TerminalModel.h" +#include "unix/TerminalView.h" class QTerminal : public QWidget {
--- a/libqterminal/unix/Screen.cpp +++ b/libqterminal/unix/Screen.cpp @@ -21,7 +21,7 @@ */ // Own -#include "Screen.h" +#include "unix/Screen.h" // Standard #include <stdio.h> @@ -36,8 +36,8 @@ #include <QtCore/QDate> // Konsole -#include "konsole_wcwidth.h" -#include "TerminalCharacterDecoder.h" +#include "unix/konsole_wcwidth.h" +#include "unix/TerminalCharacterDecoder.h" //FIXME: this is emulation specific. Use false for xterm, true for ANSI. //FIXME: see if we can get this from terminfo.
--- a/libqterminal/unix/Screen.h +++ b/libqterminal/unix/Screen.h @@ -31,8 +31,8 @@ #include <QtCore/QVarLengthArray> // Konsole -#include "Character.h" -#include "History.h" +#include "unix/Character.h" +#include "unix/History.h" #define MODE_Origin 0 #define MODE_Wrap 1
--- a/libqterminal/unix/ScreenWindow.cpp +++ b/libqterminal/unix/ScreenWindow.cpp @@ -20,13 +20,13 @@ */ // Own -#include "ScreenWindow.h" +#include "unix/ScreenWindow.h" // Qt #include <QtCore> // Konsole -#include "Screen.h" +#include "unix/Screen.h" ScreenWindow::ScreenWindow(QObject* parent) : QObject(parent)
--- a/libqterminal/unix/ScreenWindow.h +++ b/libqterminal/unix/ScreenWindow.h @@ -28,7 +28,7 @@ #include <QtCore/QRect> // Konsole -#include "Character.h" +#include "unix/Character.h" class Screen;
--- a/libqterminal/unix/SelfListener.cpp +++ b/libqterminal/unix/SelfListener.cpp @@ -1,4 +1,4 @@ -#include "SelfListener.h" +#include "unix/SelfListener.h" SelfListener::SelfListener(int a, QObject *parent) : QThread(parent) {
--- a/libqterminal/unix/TerminalCharacterDecoder.cpp +++ b/libqterminal/unix/TerminalCharacterDecoder.cpp @@ -22,7 +22,7 @@ */ // Own -#include "TerminalCharacterDecoder.h" +#include "unix/TerminalCharacterDecoder.h" // Qt #include <QtCore/QTextStream>
--- a/libqterminal/unix/TerminalCharacterDecoder.h +++ b/libqterminal/unix/TerminalCharacterDecoder.h @@ -24,7 +24,7 @@ #ifndef TERMINAL_CHARACTER_DECODER_H #define TERMINAL_CHARACTER_DECODER_H -#include "Character.h" +#include "unix/Character.h" class QTextStream;
--- a/libqterminal/unix/TerminalModel.cpp +++ b/libqterminal/unix/TerminalModel.cpp @@ -24,7 +24,7 @@ */ // Own -#include "TerminalModel.h" +#include "unix/TerminalModel.h" // Standard #include <assert.h> @@ -39,8 +39,8 @@ #include <QtCore/QStringList> #include <QtCore> -#include "TerminalView.h" -#include "Vt102Emulation.h" +#include "unix/TerminalView.h" +#include "unix/Vt102Emulation.h" TerminalModel::TerminalModel(KPty *kpty) : _shellProcess(0)
--- a/libqterminal/unix/TerminalModel.h +++ b/libqterminal/unix/TerminalModel.h @@ -31,11 +31,11 @@ #include <QtCore> #include <QWidget> -#include "SelfListener.h" +#include "unix/SelfListener.h" // Konsole -#include "History.h" -#include "kpty.h" +#include "unix/History.h" +#include "unix/kpty.h" class KProcess;
--- a/libqterminal/unix/TerminalView.cpp +++ b/libqterminal/unix/TerminalView.cpp @@ -24,7 +24,7 @@ */ // Own -#include "TerminalView.h" +#include "unix/TerminalView.h" // Qt #include <QtGui/QApplication> @@ -44,10 +44,10 @@ #include <QtCore> #include <QtGui> -#include "Filter.h" -#include "konsole_wcwidth.h" -#include "ScreenWindow.h" -#include "TerminalCharacterDecoder.h" +#include "unix/Filter.h" +#include "unix/konsole_wcwidth.h" +#include "unix/ScreenWindow.h" +#include "unix/TerminalCharacterDecoder.h" #ifndef loc #define loc(X,Y) ((Y)*_columns+(X))
--- a/libqterminal/unix/TerminalView.h +++ b/libqterminal/unix/TerminalView.h @@ -30,8 +30,8 @@ #include <QtGui/QWidget> // Konsole -#include "Filter.h" -#include "Character.h" +#include "unix/Filter.h" +#include "unix/Character.h" class QDrag; class QDragEnterEvent;
--- a/libqterminal/unix/Vt102Emulation.cpp +++ b/libqterminal/unix/Vt102Emulation.cpp @@ -21,7 +21,7 @@ */ // Own -#include "Vt102Emulation.h" +#include "unix/Vt102Emulation.h" #if defined(__osf__) || defined(__APPLE__) #define AVOID_XKB @@ -48,8 +48,8 @@ //#include <klocale.h> // Konsole -#include "KeyboardTranslator.h" -#include "Screen.h" +#include "unix/KeyboardTranslator.h" +#include "unix/Screen.h" #if defined(HAVE_XKB) void scrolllock_set_off();
--- a/libqterminal/unix/Vt102Emulation.h +++ b/libqterminal/unix/Vt102Emulation.h @@ -34,8 +34,8 @@ #include <QtCore/QTimer> // Konsole -#include "Emulation.h" -#include "Screen.h" +#include "unix/Emulation.h" +#include "unix/Screen.h" #define MODE_AppScreen (MODES_SCREEN+0) #define MODE_AppCuKeys (MODES_SCREEN+1)
--- a/libqterminal/unix/konsole_wcwidth.cpp +++ b/libqterminal/unix/konsole_wcwidth.cpp @@ -7,7 +7,7 @@ * Markus Kuhn -- 2001-01-12 -- public domain */ -#include "konsole_wcwidth.h" +#include "unix/konsole_wcwidth.h" struct interval { unsigned short first;
--- a/libqterminal/unix/kpty.cpp +++ b/libqterminal/unix/kpty.cpp @@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA. */ -#include "kpty_p.h" +#include "unix/kpty_p.h" #ifdef __sgi #define __svr4__
--- a/libqterminal/unix/kpty_p.h +++ b/libqterminal/unix/kpty_p.h @@ -23,7 +23,7 @@ #ifndef kpty_p_h #define kpty_p_h -#include "kpty.h" +#include "unix/kpty.h" #include <QtCore/QByteArray>
--- a/libqterminal/win32/QTerminalColors.cpp +++ b/libqterminal/win32/QTerminalColors.cpp @@ -22,7 +22,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#include "QTerminalColors.h" +#include "win32/QTerminalColors.h" //////////////////////////////////////////////////////////////////////////////
--- a/libqterminal/win32/QWinTerminalImpl.cpp +++ b/libqterminal/win32/QWinTerminalImpl.cpp @@ -39,8 +39,8 @@ #include <windows.h> #include <cstring> -#include "QWinTerminalImpl.h" -#include "QTerminalColors.h" +#include "win32/QWinTerminalImpl.h" +#include "win32/QTerminalColors.h" // Uncomment to log activity to LOGFILENAME // #define DEBUG_QCONSOLE