diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /korganizer/plugins/timespanview | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/plugins/timespanview')
-rw-r--r-- | korganizer/plugins/timespanview/kotimespanview.cpp | 8 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/kotimespanview.h | 7 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/lineview.cpp | 8 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/lineview.h | 9 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/timeline.cpp | 8 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/timeline.h | 9 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/timespanview.cpp | 8 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/timespanview.h | 1 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/timespanwidget.cpp | 11 | ||||
-rw-r--r-- | korganizer/plugins/timespanview/timespanwidget.h | 9 |
10 files changed, 40 insertions, 38 deletions
diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 01fc0cb40..7f70f12ea 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -35,9 +35,9 @@ #include "kotimespanview.h" #include "kotimespanview.moc" -KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, +KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *tqparent, const char *name) : - KOEventView( calendar, parent, name ) + KOEventView( calendar, tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index 49e54ab64..f0d6c6cef 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOTIMESPANVIEW_H #define KOTIMESPANVIEW_H @@ -32,8 +32,9 @@ class TimeSpanWidget; class KOTimeSpanView : public KOEventView { Q_OBJECT + TQ_OBJECT public: - KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0, + KOTimeSpanView( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); ~KOTimeSpanView(); diff --git a/korganizer/plugins/timespanview/lineview.cpp b/korganizer/plugins/timespanview/lineview.cpp index 93a2f0bfa..fe337f4eb 100644 --- a/korganizer/plugins/timespanview/lineview.cpp +++ b/korganizer/plugins/timespanview/lineview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqpainter.h> @@ -31,8 +31,8 @@ #include "lineview.h" #include "lineview.moc" -LineView::LineView( TQWidget *parent, const char *name ) : - TQScrollView( parent, name ) +LineView::LineView( TQWidget *tqparent, const char *name ) : + TQScrollView( tqparent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h index e98d905b0..df028cdb9 100644 --- a/korganizer/plugins/timespanview/lineview.h +++ b/korganizer/plugins/timespanview/lineview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LINEVIEW_H #define LINEVIEW_H @@ -27,11 +27,12 @@ #include <tqscrollview.h> #include <tqptrlist.h> -class LineView : public QScrollView +class LineView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - LineView( TQWidget *parent = 0, const char *name = 0 ); + LineView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~LineView(); int pixelWidth(); diff --git a/korganizer/plugins/timespanview/timeline.cpp b/korganizer/plugins/timespanview/timeline.cpp index 19ed75818..513701cd7 100644 --- a/korganizer/plugins/timespanview/timeline.cpp +++ b/korganizer/plugins/timespanview/timeline.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqpainter.h> @@ -29,8 +29,8 @@ #include "timeline.h" #include "timeline.moc" -TimeLine::TimeLine( TQWidget *parent, const char *name ) : - TQScrollView( parent, name ) +TimeLine::TimeLine( TQWidget *tqparent, const char *name ) : + TQScrollView( tqparent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h index 031763f72..d7718928d 100644 --- a/korganizer/plugins/timespanview/timeline.h +++ b/korganizer/plugins/timespanview/timeline.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TIMELINE_H #define TIMELINE_H @@ -27,11 +27,12 @@ #include <tqscrollview.h> #include <tqdatetime.h> -class TimeLine : public QScrollView +class TimeLine : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - TimeLine( TQWidget *parent = 0, const char *name = 0 ); + TimeLine( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~TimeLine(); void setDateRange( const TQDateTime &start, const TQDateTime &end ); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 24a45abb1..3f9e2ee57 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -35,17 +35,17 @@ using namespace KOrg; class TimespanViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create( KOrg::MainWindow *parent, const char *name ) + KOrg::Part *create( KOrg::MainWindow *tqparent, const char *name ) { - return new TimespanView( parent, name ); + return new TimespanView( tqparent, name ); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory ) -TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name), mView(0) +TimespanView::TimespanView(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h index cb2d17f70..5338e8ff5 100644 --- a/korganizer/plugins/timespanview/timespanview.h +++ b/korganizer/plugins/timespanview/timespanview.h @@ -25,6 +25,7 @@ class TimespanView : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: TimespanView(KOrg::MainWindow *, const char *); ~TimespanView(); diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index 0e8f0c4b9..e208c0881 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqsplitter.h> @@ -39,8 +39,8 @@ #include "timespanwidget.h" #include "timespanwidget.moc" -TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : - TQWidget( parent, name ) +TimeSpanWidget::TimeSpanWidget( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -123,11 +123,8 @@ void TimeSpanWidget::clear() void TimeSpanWidget::updateView() { -#if QT_VERSION >= 300 mLineView->updateContents(); mTimeLine->updateContents(); -#else -#endif } void TimeSpanWidget::setDateRange( const TQDateTime &start, const TQDateTime &end ) diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h index fa0378721..103efc5f7 100644 --- a/korganizer/plugins/timespanview/timespanwidget.h +++ b/korganizer/plugins/timespanview/timespanwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TimeSpanWidget_H #define TimeSpanWidget_H @@ -35,11 +35,12 @@ class TQListView; class LineView; class TimeLine; -class TimeSpanWidget : public QWidget +class TimeSpanWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TimeSpanWidget( TQWidget *parent=0, const char *name=0 ); + TimeSpanWidget( TQWidget *tqparent=0, const char *name=0 ); virtual ~TimeSpanWidget(); void addItem( KCal::Event * ); |