diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 00:16:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 00:16:20 -0600 |
commit | db971c3ef3fc9a8e376d6e0d44b27504dad5c85a (patch) | |
tree | a9bde102c6135a7f7896e56f9edb440e42beb076 | |
parent | 0781b9823f975702d08284499d41b8cfd62e84c9 (diff) | |
download | tdevelop-db971c3ef3fc9a8e376d6e0d44b27504dad5c85a.tar.gz tdevelop-db971c3ef3fc9a8e376d6e0d44b27504dad5c85a.zip |
Fix accidental conversion of dockwin
-rw-r--r-- | kdevdesigner/designer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/dbgtoolbar.cpp | 2 | ||||
-rw-r--r-- | languages/ruby/debugger/dbgtoolbar.cpp | 2 | ||||
-rw-r--r-- | src/newui/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/newui/Makefile.am | 4 | ||||
-rw-r--r-- | src/newui/ddoctwindow.cpp | 4 | ||||
-rw-r--r-- | src/newui/ddoctwindow.h | 2 | ||||
-rw-r--r-- | src/newui/dmainwindow.h | 2 | ||||
-rw-r--r-- | src/simplemainwindow.cpp | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp index 6b04e5c0..dbc2b932 100644 --- a/kdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -105,7 +105,7 @@ #include <tqwizard.h> #include <tqtimer.h> #include <tqlistbox.h> -#include <tqdoctwindow.h> +#include <tqdockwindow.h> #include <tqstylefactory.h> #include <tqvbox.h> #include <tqprocess.h> diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 3209c615..5da4b47a 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -17,7 +17,7 @@ #include "debuggerpart.h" #include "dbgcontroller.h" -#include <kdoctwindow.h> +#include <kdockwindow.h> #include <kiconloader.h> #include <klocale.h> #include <kpopupmenu.h> diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index e2024c87..0b96201f 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -23,7 +23,7 @@ #include "debuggerpart.h" #include "dbgcontroller.h" -#include <kdoctwindow.h> +#include <kdockwindow.h> #include <kiconloader.h> #include <klocale.h> #include <kpopupmenu.h> diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt index b70ecbfe..b65bff6a 100644 --- a/src/newui/CMakeLists.txt +++ b/src/newui/CMakeLists.txt @@ -20,6 +20,6 @@ include_directories( tde_add_library( d STATIC_PIC AUTOMOC SOURCES - dmainwindow.cpp buttonbar.cpp button.cpp ddoctwindow.cpp + dmainwindow.cpp buttonbar.cpp button.cpp ddockwindow.cpp docksplitter.cpp dtabwidget.cpp ) diff --git a/src/newui/Makefile.am b/src/newui/Makefile.am index 842bc569..f0350311 100644 --- a/src/newui/Makefile.am +++ b/src/newui/Makefile.am @@ -8,7 +8,7 @@ METASOURCES = AUTO lib_LTLIBRARIES = libd.la libd_la_LDFLAGS = $(all_libraries) -noinst_HEADERS = dmainwindow.h ddoctwindow.h buttonbar.h button.h comdefs.h docksplitter.h dtabwidget.h +noinst_HEADERS = dmainwindow.h ddockwindow.h buttonbar.h button.h comdefs.h docksplitter.h dtabwidget.h libd_la_SOURCES = dmainwindow.cpp buttonbar.cpp \ - button.cpp ddoctwindow.cpp docksplitter.cpp dtabwidget.cpp + button.cpp ddockwindow.cpp docksplitter.cpp dtabwidget.cpp libd_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) diff --git a/src/newui/ddoctwindow.cpp b/src/newui/ddoctwindow.cpp index eb76416f..bf7cc627 100644 --- a/src/newui/ddoctwindow.cpp +++ b/src/newui/ddoctwindow.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "ddoctwindow.h" +#include "ddockwindow.h" #include <tqtoolbutton.h> #include <tqlayout.h> @@ -410,4 +410,4 @@ void DDockWindow::moveToDock(DDockWindow::Position position ) } } -#include "ddoctwindow.moc" +#include "ddockwindow.moc" diff --git a/src/newui/ddoctwindow.h b/src/newui/ddoctwindow.h index ad18f525..d98aa375 100644 --- a/src/newui/ddoctwindow.h +++ b/src/newui/ddoctwindow.h @@ -20,7 +20,7 @@ #ifndef DDOCKWINDOW_H #define DDOCKWINDOW_H -#include <tqdoctwindow.h> +#include <tqdockwindow.h> #include <tqvaluelist.h> class TQBoxLayout; diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h index 325a282c..28e0340f 100644 --- a/src/newui/dmainwindow.h +++ b/src/newui/dmainwindow.h @@ -23,7 +23,7 @@ #include <kxmlguiclient.h> #include <kparts/mainwindow.h> -#include "ddoctwindow.h" +#include "ddockwindow.h" class DTabWidget; namespace Ideal { diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 94bda751..e98ce01c 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -36,7 +36,7 @@ #include <kurldrag.h> #include <kconfig.h> -#include <ddoctwindow.h> +#include <ddockwindow.h> #include <dtabwidget.h> #include <profile.h> #include <profileengine.h> |