| 3825ec9e | 2015-12-23 19:20:19 | Timothy Pearson |
Add tdelfeditor (small portion of original commit) (cherry picked from commit d6a4fe9ca855e094bbfe2e1ba1bba565557b1891) |
||
|
M kdecore/kapplication.cpp |
||
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp index b7743f2..d887951 100644 --- a/kdecore/kapplication.cpp +++ b/kdecore/kapplication.cpp @@ -645,7 +645,8 @@ } KApplication::KApplication( bool allowStyles, bool GUIenabled ) : - TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI +// TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI + TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled ), // We need to be able to run command line apps KInstance( KCmdLineArgs::about), #ifdef Q_WS_X11 display(0L), |
||
| 83e71b41 | 2015-12-23 19:20:20 | Timothy Pearson |
Allow TDEApplication objects to be constructed without a session manager This relates to Bug 760 (cherry picked from commit 6f4fd5e5632b2288a483430c625081a51342fdab) |
||
|
M kdecore/kapplication.cpp M kdecore/kapplication.h |
||
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index d887951..b5aa8bc 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -35,7 +35,14 @@
#undef QT_NO_TRANSLATION
#undef TQT_NO_TRANSLATION
#include <tqtranslator.h>
+
+// FIXME
+// FOR BINARY COMPATIBILITY ONLY
+// REMOVE WHEN PRACTICAL!
+#define TDEAPPLICATION_BINARY_COMPAT_HACK 1
#include "kapplication.h"
+#undef TDEAPPLICATION_BINARY_COMPAT_HACK
+
#define QT_NO_TRANSLATION
#define TQT_NO_TRANSLATION
#include <tqdir.h>
@@ -620,6 +627,34 @@
static TQTime* smModificationTime = 0;
KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
+ bool allowStyles, bool GUIenabled, bool SMenabled ) :
+ TQApplication( argc, argv, GUIenabled, SMenabled ), KInstance(rAppName),
+#ifdef Q_WS_X11
+ display(0L),
+ argb_visual(false),
+#endif
+ d (new KApplicationPrivate())
+{
+ aIconPixmap.pm.icon = 0L;
+ aIconPixmap.pm.miniIcon = 0L;
+ read_app_startup_id();
+ if (!GUIenabled)
+ allowStyles = false;
+ useStyles = allowStyles;
+ Q_ASSERT (!rAppName.isEmpty());
+ setName(rAppName);
+
+ installSigpipeHandler();
+ KCmdLineArgs::initIgnore(argc, argv, rAppName.data());
+ parseCommandLine( );
+ init(GUIenabled);
+ d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
+}
+
+// FIXME
+// FOR BINARY COMPATIBILITY ONLY
+// REMOVE WHEN PRACTICAL!
+KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
bool allowStyles, bool GUIenabled ) :
TQApplication( argc, argv, GUIenabled ), KInstance(rAppName),
#ifdef Q_WS_X11
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index 25ecb6e..25c527a 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -257,8 +257,16 @@
*/
// REMOVE FOR KDE 4.0 - using it only gives crashing applications because
// KCmdLineArgs::init isn't called
- KApplication(int& argc, char** argv,
- const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true) KDE_DEPRECATED;
+ KApplication(int& argc, char** argv,
+ const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) KDE_DEPRECATED;
+
+#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK
+ // FIXME
+ // FOR BINARY COMPATIBILITY ONLY
+ // REMOVE WHEN PRACTICAL!
+ KApplication(int& argc, char** argv,
+ const TQCString& rAppName, bool allowStyles, bool GUIenabled) KDE_DEPRECATED;
+#endif // TDEAPPLICATION_BINARY_COMPAT_HACK
/**
* Add Qt and KDE command line options to KCmdLineArgs.
|
||
| f05253b5 | 2015-12-23 19:20:20 | Timothy Pearson |
Allow session manager to be disable on creation when argc and argv are not passed to TDEApplication This relates to Bug 760 (cherry picked from commit 7cc3a975d2b1ac2d9efa6abef037533fc8bfec7c) |
||
|
M kdecore/kapplication.cpp M kdecore/kapplication.h |
||
diff --git a/kdecore/kapplication.cpp b/kdecore/kapplication.cpp
index b5aa8bc..1ca402e 100644
--- a/kdecore/kapplication.cpp
+++ b/kdecore/kapplication.cpp
@@ -679,6 +679,33 @@
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
}
+KApplication::KApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) :
+// TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI
+ TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled, SMenabled ), // We need to be able to run command line apps
+ KInstance( KCmdLineArgs::about),
+#ifdef Q_WS_X11
+ display(0L),
+ argb_visual(false),
+#endif
+ d (new KApplicationPrivate)
+{
+ aIconPixmap.pm.icon = 0L;
+ aIconPixmap.pm.miniIcon = 0L;
+ read_app_startup_id();
+ if (!GUIenabled)
+ allowStyles = false;
+ useStyles = allowStyles;
+ setName( instanceName() );
+
+ installSigpipeHandler();
+ parseCommandLine( );
+ init(GUIenabled);
+ d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
+}
+
+// FIXME
+// FOR BINARY COMPATIBILITY ONLY
+// REMOVE WHEN PRACTICAL!
KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
// TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled ), // We need to be able to run command line apps
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index 25c527a..f2e1218 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -128,7 +128,14 @@
* @param GUIenabled Set to false to disable all GUI stuff. This implies
* no styles either.
*/
+ KApplication( bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true);
+
+#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK
+ // FIXME
+ // FOR BINARY COMPATIBILITY ONLY
+ // REMOVE WHEN PRACTICAL!
KApplication( bool allowStyles=true, bool GUIenabled=true);
+#endif // TDEAPPLICATION_BINARY_COMPAT_HACK
#ifdef Q_WS_X11
/**
|
||
| ee598677 | 2015-12-23 19:20:20 | Timothy Pearson |
Fix tdebindings FTBFS (cherry picked from commit 3c06aad1564601e37dfce6e6bffabb4472421999) |
||
|
M kdecore/kapplication.h |
||
diff --git a/kdecore/kapplication.h b/kdecore/kapplication.h
index f2e1218..4e821d8 100644
--- a/kdecore/kapplication.h
+++ b/kdecore/kapplication.h
@@ -130,12 +130,15 @@
*/
KApplication( bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true);
+#ifdef Q_QDOC
+#else // Q_QDOC
#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK
// FIXME
// FOR BINARY COMPATIBILITY ONLY
// REMOVE WHEN PRACTICAL!
KApplication( bool allowStyles=true, bool GUIenabled=true);
#endif // TDEAPPLICATION_BINARY_COMPAT_HACK
+#endif // Q_QDOC
#ifdef Q_WS_X11
/**
@@ -267,6 +270,8 @@
KApplication(int& argc, char** argv,
const TQCString& rAppName, bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true) KDE_DEPRECATED;
+#ifdef Q_QDOC
+#else // Q_QDOC
#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK
// FIXME
// FOR BINARY COMPATIBILITY ONLY
@@ -274,6 +279,7 @@
KApplication(int& argc, char** argv,
const TQCString& rAppName, bool allowStyles, bool GUIenabled) KDE_DEPRECATED;
#endif // TDEAPPLICATION_BINARY_COMPAT_HACK
+#endif // Q_QDOC
/**
* Add Qt and KDE command line options to KCmdLineArgs.
|
||