From 840aac8d62b0a05ac697eaef5c60460942f2f9ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Nov 2011 00:16:02 -0600 Subject: Fix accidental conversion of dockwin --- NewsLog.txt | 2 +- kdgantt/KDGanttView.cpp | 2 +- kdgantt/KDGanttViewSubwidgets.cpp | 8 ++++---- kdgantt/KDGanttViewSubwidgets.h | 6 +++--- kontact/src/mainwindow.cpp | 2 +- korganizer/korgac/CMakeLists.txt | 2 +- korganizer/korgac/Makefile.am | 4 ++-- korganizer/korgac/alarmdoctwindow.cpp | 4 ++-- korganizer/korgac/koalarmclient.cpp | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NewsLog.txt b/NewsLog.txt index 9890107f..3748e00c 100644 --- a/NewsLog.txt +++ b/NewsLog.txt @@ -1914,7 +1914,7 @@ Features - protrinity5-z item 9: first part of this item, concerning sync of SEEN flags in read only folders (issue1376) (703473) protrinity5-z item 9: second part, ability to store custom flags on the server (704199) merges - protrinity5 w1-20 (665722) -- protrinity5 w1-11: Let the navigator toolbar be always the last one, if it's in the top doctwindow ( 666073) +- protrinity5 w1-11: Let the navigator toolbar be always the last one, if it's in the top dockwindow ( 666073) - protrinity5 W1-19 / kolab/issue1749 Since mail folders are not groupware folders, do a full sync, when the mail part is already active. (668988) - protrinity5 It's now possible to resize the magenta rectangle that represents the event in the freebusy diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index 0af98043..5a1618a3 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -646,7 +646,7 @@ void KDGanttView::slotHeaderSizeChanged() */ TQDockWindow* KDGanttView::legendDoctwindow() const { - return myLegend->doctwindow(); + return myLegend->dockwindow(); } diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 9f76bea6..bd83feb1 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -2553,11 +2553,11 @@ KDLegendWidget:: KDLegendWidget( TQWidget* parent, clearLegend(); showMe ( false ); } -void KDLegendWidget::setAsDoctwindow( bool doctwin ) +void KDLegendWidget::setAsDoctwindow( bool dockwin ) { - if ( (dock == 0 && !doctwin) || ( dock && doctwin ) ) + if ( (dock == 0 && !dockwin) || ( dock && dockwin ) ) return; - if ( doctwin ) + if ( dockwin ) { setMaximizedWidget( 0 ); showMe ( false ); @@ -2602,7 +2602,7 @@ bool KDLegendWidget::asDoctwindow( ) } -TQDockWindow* KDLegendWidget::doctwindow( ) +TQDockWindow* KDLegendWidget::dockwindow( ) { return dock; } diff --git a/kdgantt/KDGanttViewSubwidgets.h b/kdgantt/KDGanttViewSubwidgets.h index cbccbb10..7b553222 100644 --- a/kdgantt/KDGanttViewSubwidgets.h +++ b/kdgantt/KDGanttViewSubwidgets.h @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include "KDGanttView.h" @@ -341,9 +341,9 @@ public: void clearLegend(); void setFont( TQFont ); void drawToPainter( TQPainter *p ); - void setAsDoctwindow( bool doctwin ); + void setAsDoctwindow( bool dockwin ); bool asDoctwindow(); - TQDockWindow* doctwindow(); + TQDockWindow* dockwindow(); TQSize legendSize(); TQSize legendSizeHint(); private: diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index 52576bcf..fe24bd8d 100644 --- a/kontact/src/mainwindow.cpp +++ b/kontact/src/mainwindow.cpp @@ -842,7 +842,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin ) createGUI( plugin->part() ); KToolBar* navigatorToolBar = findToolBar( "navigatorToolBar" ); - // Let the navigator toolbar be always the last one, if it's in the top doctwindow + // Let the navigator toolbar be always the last one, if it's in the top dockwindow if ( navigatorToolBar && !navigatorToolBar->isHidden() && navigatorToolBar->barPos() == KToolBar::Top ) { topDock()->moveDockWindow( navigatorToolBar, -1 ); diff --git a/korganizer/korgac/CMakeLists.txt b/korganizer/korgac/CMakeLists.txt index b0f92302..c870221b 100644 --- a/korganizer/korgac/CMakeLists.txt +++ b/korganizer/korgac/CMakeLists.txt @@ -34,7 +34,7 @@ install( FILES korgac.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} ) tde_add_executable( korgac AUTOMOC SOURCES - korgacmain.cpp alarmdialog.cpp alarmdoctwindow.cpp koalarmclient.cpp + korgacmain.cpp alarmdialog.cpp alarmdockwindow.cpp koalarmclient.cpp alarmclientiface.skel LINK korganizer_eventviewer-shared DESTINATION ${BIN_INSTALL_DIR} diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am index b218ef2f..d5ac531a 100644 --- a/korganizer/korgac/Makefile.am +++ b/korganizer/korgac/Makefile.am @@ -6,7 +6,7 @@ korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $ korgac_LDADD = $(LIB_TDEUI) \ $(top_builddir)/korganizer/libkorganizer_eventviewer.la korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \ - alarmdoctwindow.cpp koalarmclient.cpp \ + alarmdockwindow.cpp koalarmclient.cpp \ alarmclientiface.skel check_PROGRAMS = testalarmdlg @@ -17,7 +17,7 @@ testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \ testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp noinst_HEADERS = alarmclientiface.h alarmdialog.h \ - alarmdoctwindow.h koalarmclient.h + alarmdockwindow.h koalarmclient.h METASOURCES = AUTO diff --git a/korganizer/korgac/alarmdoctwindow.cpp b/korganizer/korgac/alarmdoctwindow.cpp index 8951560d..85673ef0 100644 --- a/korganizer/korgac/alarmdoctwindow.cpp +++ b/korganizer/korgac/alarmdoctwindow.cpp @@ -22,7 +22,7 @@ without including the source code for TQt in the source distribution. */ -#include "alarmdoctwindow.h" +#include "alarmdockwindow.h" #include "koalarmclient.h" #include @@ -203,4 +203,4 @@ void AlarmDockWindow::slotQuit() emit quitSignal(); } -#include "alarmdoctwindow.moc" +#include "alarmdockwindow.moc" diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 9e55b59e..045dd992 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -26,7 +26,7 @@ #include "koalarmclient.h" -#include "alarmdoctwindow.h" +#include "alarmdockwindow.h" #include "alarmdialog.h" #include -- cgit v1.2.3