diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /khtml/ecma | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khtml/ecma')
| -rw-r--r-- | khtml/ecma/kjs_debugwin.cpp | 2 | ||||
| -rw-r--r-- | khtml/ecma/kjs_debugwin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp index 8e605d79c..b8d445900 100644 --- a/khtml/ecma/kjs_debugwin.cpp +++ b/khtml/ecma/kjs_debugwin.cpp @@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e) } //------------------------------------------------------------------------- KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) - : KMainWindow(parent, name, (WFlags)WType_TopLevel), KInstance("kjs_debugger") + : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger") { m_breakpoints = 0; m_breakpointCount = 0; diff --git a/khtml/ecma/kjs_debugwin.h b/khtml/ecma/kjs_debugwin.h index 8faf71d52..dc2368ac2 100644 --- a/khtml/ecma/kjs_debugwin.h +++ b/khtml/ecma/kjs_debugwin.h @@ -157,7 +157,7 @@ namespace KJS { * * There is only one debug window per program. This can be obtained by calling #instance */ - class KJSDebugWin : public KMainWindow, public Debugger, public KInstance + class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance { Q_OBJECT friend class SourceDisplay; |