summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-24 22:01:14 +0000
committerNorbert Thiebaud <nthiebaud@gmail.com>2013-02-24 23:46:04 +0000
commitfa24204cd728c787aaa2ff8b7460d99109120be4 (patch)
treed4dd2ed1a808c7117628593ed673cbeadef20cf6 /shell
parentbb717296bf66f0acb84d5f84c38390f3e44c7b62 (diff)
Update TDE (Trinity Desktop Environment) integration files
Change-Id: I48a5da0d01ad3532b9a77ff864f8f9e4d14e734c Reviewed-on: https://gerrit.libreoffice.org/2374 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Diffstat (limited to 'shell')
-rw-r--r--shell/inc/shell/tde_defines.h136
-rw-r--r--shell/inc/shell/tde_headers.h34
2 files changed, 93 insertions, 77 deletions
diff --git a/shell/inc/shell/tde_defines.h b/shell/inc/shell/tde_defines.h
index 52e610c72020..0dc91e931cee 100644
--- a/shell/inc/shell/tde_defines.h
+++ b/shell/inc/shell/tde_defines.h
@@ -26,67 +26,83 @@
#ifndef INCLUDED_VCL_TDE_DEFINE_HEADERS_H
#define INCLUDED_VCL_TDE_DEFINE_HEADERS_H
-#define QObject TQObject
-#define QWidget TQWidget
-#define QVBox TQVBox
-#define QHBox TQHBox
-#define QGrid TQGrid
-#define QString TQString
-#define QStringList TQStringList
-#define QCustomEvent TQCustomEvent
-#define QMutex TQMutex
-#define QEvent TQEvent
-#define QFont TQFont
-#define QDateTime TQDateTime
-#define QThread TQThread
-#define QStyle TQStyle
-#define QApplication TQApplication
-#define QRect TQRect
-#define QProgressBar TQProgressBar
-#define QPopupMenu TQPopupMenu
-#define QMenuBar TQMenuBar
-#define QToolButton TQToolButton
-#define QToolBar TQToolBar
-#define QScrollBar TQScrollBar
-#define QListView TQListView
-#define QSpinWidget TQSpinWidget
-#define QScrollBar TQScrollBar
-#define QLineEdit TQLineEdit
-#define QComboBox TQComboBox
-#define QCheckBox TQCheckBox
-#define QRadioButton TQRadioButton
-#define QPushButton TQPushButton
-#define QPainter TQPainter
-#define QResizeEvent TQResizeEvent
-#define QShowEvent TQShowEvent
-#define QPoint TQPoint
-#define QDialog TQDialog
-#define QFile TQFile
-#define QLabel TQLabel
-#define QObjectList TQObjectList
-#define QCString TQCString
-#define QRegExp TQRegExp
-#define QSessionManager TQSessionManager
-#define QPaintDevice TQPaintDevice
-#define QTextIStream TQTextIStream
-#define QTextStream TQTextStream
-#define QMutexLocker TQMutexLocker
-#define QValueList TQValueList
-#define QTab TQTab
-#define QTabBar TQTabBar
-#define QTabWidget TQTabWidget
-#define QMainWindow TQMainWindow
-#define QPixmap TQPixmap
-#define QColorGroup TQColorGroup
-#define QStyleOption TQStyleOption
-#define QSize TQSize
-#define QMenuItem TQMenuItem
-#define QFontInfo TQFontInfo
+#define QObject TQObject
+#define QWidget TQWidget
+#define QVBox TQVBox
+#define QHBox TQHBox
+#define QGrid TQGrid
+#define QString TQString
+#define QStringList TQStringList
+#define QCustomEvent TQCustomEvent
+#define QMutex TQMutex
+#define QEvent TQEvent
+#define QFont TQFont
+#define QDateTime TQDateTime
+#define QThread TQThread
+#define QStyle TQStyle
+#define QApplication TQApplication
+#define QRect TQRect
+#define QProgressBar TQProgressBar
+#define QPopupMenu TQPopupMenu
+#define QMenuBar TQMenuBar
+#define QToolButton TQToolButton
+#define QToolBar TQToolBar
+#define QScrollBar TQScrollBar
+#define QListView TQListView
+#define QSpinWidget TQSpinWidget
+#define QScrollBar TQScrollBar
+#define QLineEdit TQLineEdit
+#define QComboBox TQComboBox
+#define QCheckBox TQCheckBox
+#define QRadioButton TQRadioButton
+#define QPushButton TQPushButton
+#define QPainter TQPainter
+#define QResizeEvent TQResizeEvent
+#define QShowEvent TQShowEvent
+#define QPoint TQPoint
+#define QDialog TQDialog
+#define QFile TQFile
+#define QLabel TQLabel
+#define QObjectList TQObjectList
+#define QCString TQCString
+#define QRegExp TQRegExp
+#define QSessionManager TQSessionManager
+#define QPaintDevice TQPaintDevice
+#define QTextIStream TQTextIStream
+#define QTextStream TQTextStream
+#define QMutexLocker TQMutexLocker
+#define QValueList TQValueList
+#define QTab TQTab
+#define QTabBar TQTabBar
+#define QTabWidget TQTabWidget
+#define QMainWindow TQMainWindow
+#define QPixmap TQPixmap
+#define QColorGroup TQColorGroup
+#define QStyleOption TQStyleOption
+#define QSize TQSize
+#define QMenuItem TQMenuItem
+#define QFontInfo TQFontInfo
-#define qSwap tqSwap
-#define qt_cast tqt_cast
-#define qt_xdisplay tqt_xdisplay
-#define qVersion tqVersion
+#define qSwap tqSwap
+#define qt_cast tqt_cast
+#define qt_xdisplay tqt_xdisplay
+#define qVersion tqVersion
+
+#define KAboutData TDEAboutData
+#define KApplication TDEApplication
+#define KCmdLineArgs TDECmdLineArgs
+#define KConfig TDEConfig
+#define KGlobal TDEGlobal
+#define KGlobalSettings TDEGlobalSettings
+#define KMainWindow TDEMainWindow
+#define KStartupInfo TDEStartupInfo
+#define KStyle TDEStyle
+#define KToolBar TDEToolBar
+
+#define drawKStylePrimitive drawTDEStylePrimitive
+
+#define KIO TDEIO
+#define KABC TDEABC
#endif
diff --git a/shell/inc/shell/tde_headers.h b/shell/inc/shell/tde_headers.h
index d0f14447dd7b..ed3739eb2e43 100644
--- a/shell/inc/shell/tde_headers.h
+++ b/shell/inc/shell/tde_headers.h
@@ -68,27 +68,27 @@
/* ********* TDE base headers */
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeconfig.h>
#include <tdeversion.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmainwindow.h>
-#include <kmenubar.h>
-#include <kprotocolmanager.h>
-#include <kstartupinfo.h>
-#include <kstyle.h>
+#include <tdeemailsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemainwindow.h>
+#include <tdemenubar.h>
+#include <tdeprotocolmanager.h>
+#include <tdestartupinfo.h>
+#include <tdestyle.h>
/* ********* TDE address book connectivity headers */
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/field.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/field.h>
+#include <tdeabc/stdaddressbook.h>
#include "tde_defines.h"