summaryrefslogtreecommitdiffstats
path: root/kontact
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-13 00:46:47 +0000
commit67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch)
tree5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /kontact
parent2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff)
downloadtdepim-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 'kontact')
-rw-r--r--kontact/DESIGN.dcopinteraction2
-rw-r--r--kontact/Thoughts8
-rw-r--r--kontact/interfaces/core.cpp6
-rw-r--r--kontact/interfaces/core.h1
-rw-r--r--kontact/interfaces/plugin.cpp6
-rw-r--r--kontact/interfaces/plugin.h9
-rw-r--r--kontact/interfaces/summary.cpp12
-rw-r--r--kontact/interfaces/summary.h7
-rw-r--r--kontact/interfaces/uniqueapphandler.h9
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp4
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h5
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp4
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.h5
-rw-r--r--kontact/plugins/karm/karm_plugin.cpp4
-rw-r--r--kontact/plugins/karm/karm_plugin.h5
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp4
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.h5
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp18
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.h7
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp10
-rw-r--r--kontact/plugins/kmail/kmail_plugin.h7
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp10
-rw-r--r--kontact/plugins/kmail/summarywidget.h7
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp4
-rw-r--r--kontact/plugins/knode/knode_plugin.h5
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp10
-rw-r--r--kontact/plugins/knotes/knotes_part.h9
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h17
-rw-r--r--kontact/plugins/knotes/knotes_plugin.h1
-rw-r--r--kontact/plugins/knotes/knotetip.cpp16
-rw-r--r--kontact/plugins/knotes/knotetip.h10
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp12
-rw-r--r--kontact/plugins/knotes/summarywidget.h7
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp4
-rw-r--r--kontact/plugins/korganizer/journalplugin.h5
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp12
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.h9
-rw-r--r--kontact/plugins/korganizer/korg_uniqueapp.h6
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp10
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.h7
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp12
-rw-r--r--kontact/plugins/korganizer/summarywidget.h7
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp10
-rw-r--r--kontact/plugins/korganizer/todoplugin.h7
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp14
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.h7
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp22
-rw-r--r--kontact/plugins/kpilot/summarywidget.h9
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp50
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.h12
-rw-r--r--kontact/plugins/newsticker/newsfeeds.h26
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp16
-rw-r--r--kontact/plugins/newsticker/summarywidget.h9
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp12
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.h7
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp20
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.h7
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp4
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.h4
-rw-r--r--kontact/plugins/summary/dropwidget.cpp8
-rw-r--r--kontact/plugins/summary/dropwidget.h5
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp26
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.h10
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp32
-rw-r--r--kontact/plugins/summary/summaryview_part.h3
-rw-r--r--kontact/plugins/summary/summaryview_plugin.h1
-rw-r--r--kontact/plugins/test/test_part.cpp10
-rw-r--r--kontact/plugins/test/test_part.h7
-rw-r--r--kontact/plugins/test/test_plugin.cpp4
-rw-r--r--kontact/plugins/test/test_plugin.h5
-rw-r--r--kontact/plugins/weather/summarywidget.cpp14
-rw-r--r--kontact/plugins/weather/summarywidget.h7
-rw-r--r--kontact/src/aboutdialog.cpp8
-rw-r--r--kontact/src/aboutdialog.h5
-rw-r--r--kontact/src/iconsidepane.cpp18
-rw-r--r--kontact/src/iconsidepane.h16
-rw-r--r--kontact/src/kcmkontact.cpp22
-rw-r--r--kontact/src/kcmkontact.h10
-rw-r--r--kontact/src/mainwindow.cpp24
-rw-r--r--kontact/src/mainwindow.h5
-rw-r--r--kontact/src/profiledialog.cpp6
-rw-r--r--kontact/src/profiledialog.h7
-rw-r--r--kontact/src/profilemanager.cpp6
-rw-r--r--kontact/src/profilemanager.h9
-rw-r--r--kontact/src/sidepanebase.cpp4
-rw-r--r--kontact/src/sidepanebase.h5
86 files changed, 438 insertions, 393 deletions
diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction
index f3b57598..4f7d1185 100644
--- a/kontact/DESIGN.dcopinteraction
+++ b/kontact/DESIGN.dcopinteraction
@@ -74,7 +74,7 @@ See e.g. kdepim/kaddressbook/kaddressbook.desktop
Designing DCOP interfaces
=========================
-Porting the kroupware signals/slots to DCOP requires some changes.
+Porting the kroupware Q_SIGNALS/Q_SLOTS to DCOP requires some changes.
For instance any non-const reference (such as those used for returning
values to the caller) has to be changed. If there is more than one
value to be returned, you need to
diff --git a/kontact/Thoughts b/kontact/Thoughts
index e1a07c1f..720836a7 100644
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@@ -203,7 +203,7 @@ Don:
Don: And the same for all other loadX apps.
-Status Bar
+tqStatus Bar
----------
d We need a more sophisticated handling (progressbar, etc)
@@ -285,7 +285,7 @@ s like that.
d Yes, but of course one should always prefer in-process IPC if possible. DCOP
d currently _works_ for Kontact, but that's all about it. It isn't exactly elegant.
d The only advantange of the current approach is that we can allow the user to
-d run one of the parts standalone. I am not really sure we want that. I used to find
+d run one of the parts standalone. I am not really sure we want that. I used to tqfind
d it desireable, but I am not sure anymore.
MiB: But that's the whole idea behind Kontact---to be able to integrate apps
@@ -311,7 +311,7 @@ MiB: yes, not too much against DCOP. But for KNotes I thought about turning
MiB: a note into a plugin that can be loaded by Kontact and KNotes independently.
MiB: like this, there's no DCOP necessary anymore and makes it much more flexible.
MiB: e.g. usage of different display configs, a note embedded somewhere and having
-MiB: a parent or standalone on the desktop.
+MiB: a tqparent or standalone on the desktop.
# Communication with external applications is something which doesn't fit too
# well with the 'integrated' approach of Kontact. Is this really necessary?
@@ -367,7 +367,7 @@ h: there is something else broken IMHO
Summary View
------------
h: How would one best integrate a summary view into kontact?
-h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* parent );
+h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* tqparent );
h: to get a summary widget for a day?
h: b) use some sort of XML to UI to represent the summary informations
h: c) have a stand a lone part which opens the PIM data seperately? ( How
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index e940a53c..b77fabd2 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -37,8 +37,8 @@ public:
TQString lastErrorMessage;
};
-Core::Core( TQWidget *parent, const char *name )
- : KParts::MainWindow( parent, name )
+Core::Core( TQWidget *tqparent, const char *name )
+ : KParts::MainWindow( tqparent, name )
{
d = new Private;
TQTimer* timer = new TQTimer( this );
@@ -57,7 +57,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname )
kdDebug(5601) << "Core::createPart(): " << libname << endl;
TQMap<TQCString,KParts::ReadOnlyPart *>::ConstIterator it;
- it = mParts.find( libname );
+ it = mParts.tqfind( libname );
if ( it != mParts.end() ) return it.data();
kdDebug(5601) << "Creating new KPart" << endl;
diff --git a/kontact/interfaces/core.h b/kontact/interfaces/core.h
index e84b3b8d..b060cc8a 100644
--- a/kontact/interfaces/core.h
+++ b/kontact/interfaces/core.h
@@ -41,6 +41,7 @@ class Plugin;
class KDE_EXPORT Core : public KParts::MainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
virtual ~Core();
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index 6025664f..1d7a2a1a 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -53,8 +53,8 @@ class Plugin::Private
};
-Plugin::Plugin( Kontact::Core *core, TQObject *parent, const char *name )
- : KXMLGUIClient( core ), TQObject( parent, name ), d( new Private )
+Plugin::Plugin( Kontact::Core *core, TQObject *tqparent, const char *name )
+ : KXMLGUIClient( core ), TQObject( tqparent, name ), d( new Private )
{
core->factory()->addClient( this );
KGlobal::locale()->insertCatalogue(name);
@@ -156,7 +156,7 @@ KParts::ReadOnlyPart *Plugin::part()
TQString Plugin::tipFile() const
{
- return TQString::null;
+ return TQString();
}
diff --git a/kontact/interfaces/plugin.h b/kontact/interfaces/plugin.h
index 5a62beea..f0fcc154 100644
--- a/kontact/interfaces/plugin.h
+++ b/kontact/interfaces/plugin.h
@@ -58,6 +58,7 @@ class Summary;
class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -68,7 +69,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
provides the part! This is the name used for DCOP registration.
It's ok to have several plugins using the same application name.
*/
- Plugin( Core *core, TQObject *parent, const char *name );
+ Plugin( Core *core, TQObject *tqparent, const char *name );
~Plugin();
@@ -114,7 +115,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
TQString executableName() const;
/**
- Set name of library which tqcontains the KPart used by this plugin.
+ Set name of library which contains the KPart used by this plugin.
*/
void setPartLibraryName( const TQCString & );
@@ -171,7 +172,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
Reimplement this method if you want to add a widget for your application
to Kontact's summary page.
*/
- virtual Summary *createSummaryWidget( TQWidget * /*parent*/ ) { return 0; }
+ virtual Summary *createSummaryWidget( TQWidget * /*tqparent*/ ) { return 0; }
/**
Returns whether the plugin provides a part that should be shown in the sidebar.
@@ -196,7 +197,7 @@ class KDE_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
The clients name is taken from the name argument in the constructor.
@note: The DCOPClient object will only be created when this method is
called for the first time. Make sure that the part has been loaded
- before calling this method, if it's the one that tqcontains the DCOP
+ before calling this method, if it's the one that contains the DCOP
interface that other parts might use.
*/
DCOPClient *dcopClient() const;
diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp
index 86902ca0..0f4c048c 100644
--- a/kontact/interfaces/summary.cpp
+++ b/kontact/interfaces/summary.cpp
@@ -34,8 +34,8 @@
using namespace Kontact;
-Summary::Summary( TQWidget *parent, const char *name )
- : TQWidget( parent, name )
+Summary::Summary( TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name )
{
setAcceptDrops( true );
}
@@ -44,9 +44,9 @@ Summary::~Summary()
{
}
-TQWidget* Summary::createHeader(TQWidget *parent, const TQPixmap& icon, const TQString& heading)
+TQWidget* Summary::createHeader(TQWidget *tqparent, const TQPixmap& icon, const TQString& heading)
{
- TQHBox* hbox = new TQHBox( parent );
+ TQHBox* hbox = new TQHBox( tqparent );
hbox->setMargin( 2 );
TQFont boldFont;
@@ -93,7 +93,7 @@ void Summary::mouseMoveEvent( TQMouseEvent *event )
TQPainter painter;
painter.begin( &pm );
- painter.setPen( Qt::gray );
+ painter.setPen( TQt::gray );
painter.drawRect( 0, 0, pm.width(), pm.height() );
painter.end();
drag->setPixmap( pm );
@@ -109,7 +109,7 @@ void Summary::dragEnterEvent( TQDragEnterEvent *event )
void Summary::dropEvent( TQDropEvent *event )
{
- int tqalignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom);
+ int tqalignment = (event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom);
emit summaryWidgetDropped( this, event->source(), tqalignment );
}
diff --git a/kontact/interfaces/summary.h b/kontact/interfaces/summary.h
index 29a89019..a845401f 100644
--- a/kontact/interfaces/summary.h
+++ b/kontact/interfaces/summary.h
@@ -33,12 +33,13 @@ namespace Kontact
/**
Summary widget for display in the Summary View plugin.
*/
-class KDE_EXPORT Summary : public QWidget
+class KDE_EXPORT Summary : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- Summary( TQWidget *parent, const char *name = 0 );
+ Summary( TQWidget *tqparent, const char *name = 0 );
virtual ~Summary();
@@ -52,7 +53,7 @@ class KDE_EXPORT Summary : public QWidget
/**
Creates a heading for a typical summary view with an icon and a heading.
*/
- TQWidget *createHeader( TQWidget* parent, const TQPixmap &icon,
+ TQWidget *createHeader( TQWidget* tqparent, const TQPixmap &icon,
const TQString& heading );
/**
diff --git a/kontact/interfaces/uniqueapphandler.h b/kontact/interfaces/uniqueapphandler.h
index 62886cc1..b93b5965 100644
--- a/kontact/interfaces/uniqueapphandler.h
+++ b/kontact/interfaces/uniqueapphandler.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KONTACT_UNIQUEAPPHANDLER_H
-#define KONTACT_UNIQUEAPPHANDLER_H
+#ifndef KONTACT_UNITQUEAPPHANDLER_H
+#define KONTACT_UNITQUEAPPHANDLER_H
#include <dcopobject.h>
#include <plugin.h>
@@ -89,9 +89,10 @@ template <class T> class UniqueAppHandlerFactory : public UniqueAppHandlerFactor
* Kontact takes over from there.
*
*/
-class KDE_EXPORT UniqueAppWatcher : public QObject
+class KDE_EXPORT UniqueAppWatcher : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -120,4 +121,4 @@ class KDE_EXPORT UniqueAppWatcher : public QObject
} // namespace
-#endif /* KONTACT_UNIQUEAPPHANDLER_H */
+#endif /* KONTACT_UNITQUEAPPHANDLER_H */
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 16f80e80..d0ef181f 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.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 <tqwidget.h>
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 6689a5a3..207fa894 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.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 AKREGATOR_PLUGIN_H
@@ -51,6 +51,7 @@ class UniqueAppHandler : public Kontact::UniqueAppHandler
class Plugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
Plugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index d0493f1d..8fafeb98 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.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 <tqwidget.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index 85107d0b..8302dee7 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.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 KADDRESSBOOK_PLUGIN_H
@@ -45,6 +45,7 @@ public:
class KAddressbookPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KAddressbookPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index c79bdab2..0f3fa946 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -19,8 +19,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 <kgenericfactory.h>
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index f4cb04bd..0996f399 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -19,8 +19,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 KARM_PLUGIN_H
@@ -37,6 +37,7 @@ class KAboutData;
class KarmPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KarmPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index 343d724b..90ce22db 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.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 <tqwidget.h>
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
index f3b8c62a..efb218c1 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.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 KITCHENSYNC_PLUGIN_H
@@ -35,6 +35,7 @@ class KAboutData;
class KitchenSyncPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KitchenSyncPlugin( Kontact::Core *core, const char *name,
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index e27254e3..ae776555 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -17,8 +17,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 <tqcheckbox.h>
@@ -41,14 +41,14 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kmailsummary( TQWidget *tqparent, const char * )
{
- return new KCMKMailSummary( parent, "kcmkmailsummary" );
+ return new KCMKMailSummary( tqparent, "kcmkmailsummary" );
}
}
-KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMKMailSummary::KCMKMailSummary( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
initGUI();
@@ -109,14 +109,14 @@ void KCMKMailSummary::initFolders()
folderRef.call( "displayName()" ).get( displayName );
}
if ( (*it).tqcontains( '/' ) == 1 ) {
- if ( mFolderMap.find( *it ) == mFolderMap.end() )
+ if ( mFolderMap.tqfind( *it ) == mFolderMap.end() )
mFolderMap.insert( *it, new TQListViewItem( mFolderView,
displayName ) );
} else {
const int pos = (*it).findRev( '/' );
- const TQString parentFolder = (*it).left( pos );
+ const TQString tqparentFolder = (*it).left( pos );
mFolderMap.insert( *it,
- new TQCheckListItem( mFolderMap[ parentFolder ],
+ new TQCheckListItem( mFolderMap[ tqparentFolder ],
displayName,
TQCheckListItem::CheckBox ) );
}
diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h
index 4ef16a96..068fa4a8 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.h
+++ b/kontact/plugins/kmail/kcmkmailsummary.h
@@ -17,8 +17,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 KCMKMAILSUMMARY_H
@@ -36,9 +36,10 @@ class TQCheckListItem;
class KCMKMailSummary : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 );
+ KCMKMailSummary( TQWidget *tqparent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index c2aff819..55a192e3 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -17,8 +17,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 <tqwidget.h>
@@ -125,7 +125,7 @@ void KMailPlugin::openComposer( const TQString& to )
void KMailPlugin::slotNewMail()
{
- openComposer( TQString::null );
+ openComposer( TQString() );
}
void KMailPlugin::slotSyncFolders()
@@ -174,9 +174,9 @@ bool KMailPlugin::isRunningStandalone()
return mUniqueAppWatcher->isRunningStandalone();
}
-Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *tqparent )
{
- return new SummaryWidget( this, parent );
+ return new SummaryWidget( this, tqparent );
}
////
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index 0077182b..46998d80 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -17,8 +17,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 KMAIL_PLUGIN_H
@@ -46,6 +46,7 @@ public:
class KMailPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& );
@@ -53,7 +54,7 @@ class KMailPlugin : public Kontact::Plugin
virtual bool isRunningStandalone();
virtual bool createDCOPInterface( const TQString& serviceType );
- virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+ virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
virtual TQString tipFile() const;
int weight() const { return 200; }
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 92023570..b7228342 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.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 <tqlabel.h>
@@ -41,8 +41,8 @@
#include <time.h>
-SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name )
- : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name )
+ : Kontact::Summary( tqparent, name ),
DCOPObject( TQCString("MailSummary") ),
mPlugin( plugin )
{
@@ -168,7 +168,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Open Folder: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h
index bd875565..575aceae 100644
--- a/kontact/plugins/kmail/summarywidget.h
+++ b/kontact/plugins/kmail/summarywidget.h
@@ -17,8 +17,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 SUMMARYWIDGET_H
@@ -41,10 +41,11 @@ class TQString;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
- SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 );
+ SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 );
int summaryHeight() const { return 1; }
TQStringList configModules() const;
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index 131c8bdf..d78e1e29 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.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 "knode_plugin.h"
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index 3701dc7b..c8d1d637 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.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 KNODE_PLUGIN_H
@@ -43,6 +43,7 @@ public:
class KNodePlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KNodePlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index ef70e8f5..a7864c42 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -38,8 +38,8 @@
#include "knotetip.h"
-KNotesPart::KNotesPart( TQObject *parent, const char *name )
- : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( parent, name ),
+KNotesPart::KNotesPart( TQObject *tqparent, const char *name )
+ : DCOPObject( "KNotesIface" ), KParts::ReadOnlyPart( tqparent, name ),
mNotesView( new KNotesIconView() ),
mNoteTip( new KNoteTip( mNotesView ) ),
mNoteEditDlg( 0 ),
@@ -233,7 +233,7 @@ TQString KNotesPart::name( const TQString& id ) const
if ( note )
return note->text();
else
- return TQString::null;
+ return TQString();
}
TQString KNotesPart::text( const TQString& id ) const
@@ -242,7 +242,7 @@ TQString KNotesPart::text( const TQString& id ) const
if ( note )
return note->journal()->description();
else
- return TQString::null;
+ return TQString();
}
void KNotesPart::setName( const TQString& id, const TQString& newName )
@@ -328,7 +328,7 @@ void KNotesPart::popupRMB( TQIconViewItem *item, const TQPoint& pos )
void KNotesPart::slotOnItem( TQIconViewItem *i )
{
- // TODO: disable (i.e. setNote( TQString::null )) when mouse button pressed
+ // TODO: disable (i.e. setNote( TQString() )) when mouse button pressed
KNotesIconViewItem *item = static_cast<KNotesIconViewItem *>( i );
mNoteTip->setNote( item );
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index 764bb484..9bc4e847 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -47,17 +47,18 @@ class Journal;
class KNotesPart : public KParts::ReadOnlyPart, virtual public KNotesIface
{
Q_OBJECT
+ TQ_OBJECT
public:
- KNotesPart( TQObject *parent = 0, const char *name = 0 );
+ KNotesPart( TQObject *tqparent = 0, const char *name = 0 );
~KNotesPart();
bool openFile();
public slots:
- TQString newNote( const TQString& name = TQString::null,
- const TQString& text = TQString::null );
- TQString newNoteFromClipboard( const TQString& name = TQString::null );
+ TQString newNote( const TQString& name = TQString(),
+ const TQString& text = TQString() );
+ TQString newNoteFromClipboard( const TQString& name = TQString() );
public:
void killNote( const TQString& id );
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index 2c96235f..7665426c 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -60,8 +60,8 @@
class KNotesIconViewItem : public KIconViewItem
{
public:
- KNotesIconViewItem( KIconView *parent, KCal::Journal *journal )
- : KIconViewItem( parent ),
+ KNotesIconViewItem( KIconView *tqparent, KCal::Journal *journal )
+ : KIconViewItem( tqparent ),
mJournal( journal )
{
setRenameEnabled( true );
@@ -115,11 +115,12 @@ class KNotesIconView : public KIconView
class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
{
Q_OBJECT
+ TQ_OBJECT
public:
- KNoteEditDlg( TQWidget *parent = 0, const char *name = 0 )
+ KNoteEditDlg( TQWidget *tqparent = 0, const char *name = 0 )
: KDialogBase( Plain, i18n( "Edit Note" ), Ok | Cancel, Ok,
- parent, name, true, true )
+ tqparent, name, true, true )
{
// this dialog is modal to prevent one from editing the same note twice in two
// different windows
@@ -136,7 +137,7 @@ class KNoteEditDlg : public KDialogBase, virtual public KXMLGUIClient
label->setText( i18n( "Name:" ) );
hbl->addWidget( label,0 );
mTitleEdit= new KLineEdit( page, "name" );
- hbl->addWidget( mTitleEdit, 1,Qt::AlignVCenter );
+ hbl->addWidget( mTitleEdit, 1,TQt::AlignVCenter );
mNoteEdit = new KNoteEdit( actionCollection(), page );
mNoteEdit->setTextFormat( RichText );
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index 65e6450d..680eb7f5 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -32,6 +32,7 @@ class SummaryWidget;
class KNotesPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KNotesPlugin( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 3ba9a9ab..afa21fb4 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -40,11 +40,11 @@
#include "knotes_part_p.h"
-KNoteTip::KNoteTip( KIconView *parent )
+KNoteTip::KNoteTip( KIconView *tqparent )
: TQFrame( 0, 0, WX11BypassWM | // this will make Seli happy >:-P
WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop ),
mFilter( false ),
- mView( parent ),
+ mView( tqparent ),
mNoteIVI( 0 ),
mPreview( new TQTextEdit( this ) )
{
@@ -83,9 +83,9 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
} else {
KCal::Journal *journal = item->journal();
if ( journal->customProperty( "KNotes", "RichText" ) == "true" )
- mPreview->setTextFormat( Qt::RichText );
+ mPreview->setTextFormat( TQt::RichText );
else
- mPreview->setTextFormat( Qt::PlainText );
+ mPreview->setTextFormat( TQt::PlainText );
TQColor fg( journal->customProperty( "KNotes", "FgColor" ) );
TQColor bg( journal->customProperty( "KNotes", "BgColor" ) );
@@ -101,7 +101,7 @@ void KNoteTip::setNote( KNotesIconViewItem *item )
w -= 20;
TQRect desk = KGlobalSettings::desktopGeometry( mNoteIVI->rect().center() );
- resize( w, QMIN( h, desk.height() / 2 - 20 ) );
+ resize( w, TQMIN( h, desk.height() / 2 - 20 ) );
hide();
killTimers();
diff --git a/kontact/plugins/knotes/knotetip.h b/kontact/plugins/knotes/knotetip.h
index c19244fa..ca342fa4 100644
--- a/kontact/plugins/knotes/knotetip.h
+++ b/kontact/plugins/knotes/knotetip.h
@@ -19,11 +19,11 @@
In addition, as a special exception, the copyright holders give
permission to link the code of this program with any edition of
- the Qt library by Trolltech AS, Norway (or with modified versions
- of Qt that use the same license as Qt), and distribute linked
+ the TQt library by Trolltech AS, Norway (or with modified versions
+ of TQt that use the same license as TQt), and distribute linked
combinations including the two. You must obey the GNU General
Public License in all respects for all of the code used other than
- Qt. If you modify this file, you may extend this exception to
+ TQt. If you modify this file, you may extend this exception to
your version of the file, but you are not obligated to do so. If
you do not wish to do so, delete this exception statement from
your version.
@@ -38,10 +38,10 @@ class TQTextEdit;
class KIconView;
class KNotesIconViewItem;
-class KNoteTip : public QFrame
+class KNoteTip : public TQFrame
{
public:
- KNoteTip( KIconView *parent );
+ KNoteTip( KIconView *tqparent );
~KNoteTip();
void setNote( KNotesIconViewItem *item );
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index b714ff19..611425b9 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -17,8 +17,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 <tqobject.h>
@@ -45,8 +45,8 @@
#include "summarywidget.h"
KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
- TQWidget *parent, const char *name )
- : Kontact::Summary( parent, name ), mLayout( 0 ), mPlugin( plugin )
+ TQWidget *tqparent, const char *name )
+ : Kontact::Summary( tqparent, name ), mLayout( 0 ), mPlugin( plugin )
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
@@ -103,7 +103,7 @@ void KNotesSummaryWidget::updateView()
KURLLabel *urlLabel = new KURLLabel( (*it)->uid(), newtext, this );
urlLabel->installEventFilter( this );
urlLabel->setTextFormat(RichText);
- urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
+ urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
mLayout->addWidget( urlLabel, counter, 1 );
mLabels.append( urlLabel );
@@ -142,7 +142,7 @@ bool KNotesSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Read Note: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/knotes/summarywidget.h b/kontact/plugins/knotes/summarywidget.h
index cc71f472..97ccd094 100644
--- a/kontact/plugins/knotes/summarywidget.h
+++ b/kontact/plugins/knotes/summarywidget.h
@@ -17,8 +17,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 SUMMARYWIDGET_H
@@ -43,9 +43,10 @@ namespace Kontact {
class KNotesSummaryWidget : public Kontact::Summary
{
Q_OBJECT
+ TQ_OBJECT
public:
- KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 );
+ KNotesSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 );
void updateSummary( bool force = false ) { Q_UNUSED( force ); updateView(); }
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 789762d5..a14785a7 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.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 <tqwidget.h>
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index beb4c2e9..af76b782 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.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 KONTACT_JOURNALPLUGIN_H
#define KONTACT_JOURNALPLUGIN_H
@@ -34,6 +34,7 @@
class JournalPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
JournalPlugin( Kontact::Core *core, const char *name, const TQStringList& );
~JournalPlugin();
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index ba431eb3..e07bd441 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -17,8 +17,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 <tqbuttongroup.h>
@@ -41,14 +41,14 @@
extern "C"
{
- KDE_EXPORT KCModule *create_korgsummary( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_korgsummary( TQWidget *tqparent, const char * )
{
- return new KCMKOrgSummary( parent, "kcmkorgsummary" );
+ return new KCMKOrgSummary( tqparent, "kcmkorgsummary" );
}
}
-KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMKOrgSummary::KCMKOrgSummary( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
initGUI();
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.h b/kontact/plugins/korganizer/kcmkorgsummary.h
index 60a876d1..6d19f30f 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.h
+++ b/kontact/plugins/korganizer/kcmkorgsummary.h
@@ -17,8 +17,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 KCMKORGSUMMARY_H
@@ -26,15 +26,16 @@
#include <kcmodule.h>
-class QSpinxBox;
+class TQSpinxBox;
class TQButtonGroup;
class KCMKOrgSummary : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMKOrgSummary( TQWidget *parent = 0, const char *name = 0 );
+ KCMKOrgSummary( TQWidget *tqparent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.h b/kontact/plugins/korganizer/korg_uniqueapp.h
index d21f8c52..068fd35f 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.h
+++ b/kontact/plugins/korganizer/korg_uniqueapp.h
@@ -19,8 +19,8 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef KORG_UNIQUEAPP_H
-#define KORG_UNIQUEAPP_H
+#ifndef KORG_UNITQUEAPP_H
+#define KORG_UNITQUEAPP_H
#include <uniqueapphandler.h>
@@ -33,5 +33,5 @@ public:
};
-#endif /* KORG_UNIQUEAPP_H */
+#endif /* KORG_UNITQUEAPP_H */
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index d740721c..2a712c8c 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.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 <tqcursor.h>
@@ -80,14 +80,14 @@ KOrganizerPlugin::~KOrganizerPlugin()
{
}
-Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *KOrganizerPlugin::createSummaryWidget( TQWidget *tqparent )
{
// korg part must be loaded, otherwise when starting kontact on summary view
// it won't display our stuff.
// If the part is already loaded loadPart() is harmless and just returns
loadPart();
- return new SummaryWidget( this, parent );
+ return new SummaryWidget( this, tqparent );
}
KParts::ReadOnlyPart *KOrganizerPlugin::createPart()
@@ -181,7 +181,7 @@ void KOrganizerPlugin::processDropEvent( TQDropEvent *event )
attendees.append( email );
}
}
- interface()->openEventEditor( i18n( "Meeting" ), TQString::null, TQString::null,
+ interface()->openEventEditor( i18n( "Meeting" ), TQString(), TQString(),
attendees );
return;
}
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 1343464e..4aaa4a0b 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.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 KORGANIZER_PLUGIN_H
@@ -36,6 +36,7 @@
class KOrganizerPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
KOrganizerPlugin( Kontact::Core *core, const char *name, const TQStringList& );
@@ -50,7 +51,7 @@ class KOrganizerPlugin : public Kontact::Plugin
bool canDecodeDrag( TQMimeSource * );
void processDropEvent( TQDropEvent * );
- virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+ virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
virtual TQString tipFile() const;
virtual TQStringList invisibleToolbarActions() const;
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 06a4694c..1409c37b 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -17,8 +17,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 <tqcursor.h>
@@ -50,9 +50,9 @@
#include "summarywidget.h"
-SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
+SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent,
const char *name )
- : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 )
+ : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 )
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
@@ -198,7 +198,7 @@ void SummaryWidget::updateView()
urlLabel->setText( newtext );
urlLabel->setURL( ev->uid() );
urlLabel->installEventFilter( this );
- urlLabel->tqsetAlignment( urlLabel->tqalignment() | Qt::WordBreak );
+ urlLabel->tqsetAlignment( urlLabel->tqalignment() | TQt::WordBreak );
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
@@ -290,7 +290,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit Appointment: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/korganizer/summarywidget.h b/kontact/plugins/korganizer/summarywidget.h
index 2f018a50..9e2350ea 100644
--- a/kontact/plugins/korganizer/summarywidget.h
+++ b/kontact/plugins/korganizer/summarywidget.h
@@ -17,8 +17,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 SUMMARYWIDGET_H
@@ -39,9 +39,10 @@ class KOrganizerPlugin;
class SummaryWidget : public Kontact::Summary
{
Q_OBJECT
+ TQ_OBJECT
public:
- SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
+ SummaryWidget( KOrganizerPlugin *plugin, TQWidget *tqparent,
const char *name = 0 );
~SummaryWidget();
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 3b553ee0..cefd8bbe 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.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 <tqwidget.h>
@@ -77,9 +77,9 @@ TodoPlugin::~TodoPlugin()
{
}
-Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *parent )
+Kontact::Summary *TodoPlugin::createSummaryWidget( TQWidget *tqparent )
{
- return new TodoSummaryWidget( this, parent );
+ return new TodoSummaryWidget( this, tqparent );
}
KParts::ReadOnlyPart *TodoPlugin::createPart()
@@ -173,7 +173,7 @@ void TodoPlugin::processDropEvent( TQDropEvent *event )
attendees.append( email );
}
}
- interface()->openTodoEditor( i18n( "Meeting" ), TQString::null, TQString::null,
+ interface()->openTodoEditor( i18n( "Meeting" ), TQString(), TQString(),
attendees );
return;
}
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 5fc13316..9bff00d0 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.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 KONTACT_TODOPLUGIN_H
#define KONTACT_TODOPLUGIN_H
@@ -34,6 +34,7 @@
class TodoPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
TodoPlugin( Kontact::Core *core, const char *name, const TQStringList& );
~TodoPlugin();
@@ -47,7 +48,7 @@ class TodoPlugin : public Kontact::Plugin
virtual TQStringList invisibleToolbarActions() const;
- virtual Kontact::Summary *createSummaryWidget( TQWidget *parent );
+ virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent );
void select();
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 05e9ea55..7bd1be11 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -17,8 +17,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 <tqcursor.h>
@@ -53,8 +53,8 @@
#include "todosummarywidget.h"
TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
- TQWidget *parent, const char *name )
- : Kontact::Summary( parent, name ), mPlugin( plugin )
+ TQWidget *tqparent, const char *name )
+ : Kontact::Summary( tqparent, name ), mPlugin( plugin )
{
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
@@ -152,14 +152,14 @@ void TodoSummaryWidget::updateView()
mLabels.append( label );
TQString sSummary = todo->summary();
- if ( todo->relatedTo() ) { // show parent only, not entire ancestry
+ if ( todo->relatedTo() ) { // show tqparent only, not entire ancestry
sSummary = todo->relatedTo()->summary() + ":" + todo->summary();
}
KURLLabel *urlLabel = new KURLLabel( this );
urlLabel->setText( sSummary );
urlLabel->setURL( todo->uid() );
urlLabel->installEventFilter( this );
- urlLabel->setTextFormat( Qt::RichText );
+ urlLabel->setTextFormat( TQt::RichText );
mLayout->addWidget( urlLabel, counter, 2 );
mLabels.append( urlLabel );
@@ -255,7 +255,7 @@ bool TodoSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Edit To-do: \"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/korganizer/todosummarywidget.h b/kontact/plugins/korganizer/todosummarywidget.h
index c5286e19..974a45b3 100644
--- a/kontact/plugins/korganizer/todosummarywidget.h
+++ b/kontact/plugins/korganizer/todosummarywidget.h
@@ -17,8 +17,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 TODO_SUMMARYWIDGET_H
@@ -39,9 +39,10 @@ class TodoPlugin;
class TodoSummaryWidget : public Kontact::Summary
{
Q_OBJECT
+ TQ_OBJECT
public:
- TodoSummaryWidget( TodoPlugin *plugin, TQWidget *parent,
+ TodoSummaryWidget( TodoPlugin *plugin, TQWidget *tqparent,
const char *name = 0 );
~TodoSummaryWidget();
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index ba11d9b5..3e757713 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.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 <tqimage.h>
@@ -49,8 +49,8 @@
#include "summarywidget.h"
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
- : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+ : Kontact::Summary( tqparent, name ),
DCOPObject( "KPilotSummaryWidget" ),
mDCOPSuccess( false ),
mStartedDaemon( false ),
@@ -88,9 +88,9 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mPilotDeviceLabel = new TQLabel( i18n( "Unknown" ), this );
mLayout->addMultiCellWidget( mPilotDeviceLabel, row, row, 1, 3 );
- // Status
+ // tqStatus
row++;
- mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this);
+ mDaemonStatusTextLabel = new TQLabel( i18n( "<i>tqStatus:</i>" ), this);
mLayout->addWidget( mDaemonStatusTextLabel, row, 0 );
mDaemonStatusLabel = new TQLabel( i18n( "No communication with the daemon possible" ), this );
mLayout->addMultiCellWidget( mDaemonStatusLabel, row, row, 1, 3 );
@@ -101,7 +101,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
mConduitsTextLabel->tqsetAlignment( AlignAuto | AlignTop | ExpandTabs );
mLayout->addWidget( mConduitsTextLabel, row, 0 );
mConduitsLabel = new TQLabel( i18n( "No information available" ), this );
- mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | Qt::WordBreak );
+ mConduitsLabel->tqsetAlignment( mConduitsLabel->tqalignment() | TQt::WordBreak );
mLayout->addMultiCellWidget( mConduitsLabel, row, row, 1, 3 );
// widgets shown if kpilotDaemon is not running
@@ -141,7 +141,7 @@ void SummaryWidget::receiveDaemonStatusDetails(TQDateTime lastSyncTime, TQString
{
mDCOPSuccess = true;
mLastSyncTime = lastSyncTime;
- mDaemonStatus = status;
+ mDaemontqStatus = status;
mConduits = conduits;
mSyncLog = logFileName;
mUserName = userName;
@@ -154,7 +154,7 @@ void SummaryWidget::updateView()
{
if ( mDCOPSuccess ) {
if ( mLastSyncTime.isValid() ) {
- mSyncTimeLabel->setText( mLastSyncTime.toString(Qt::LocalDate) );
+ mSyncTimeLabel->setText( mLastSyncTime.toString(TQt::LocalDate) );
} else {
mSyncTimeLabel->setText( i18n( "No information available" ) );
}
@@ -166,7 +166,7 @@ void SummaryWidget::updateView()
}
mPilotUserLabel->setText( mUserName.isEmpty() ? i18n( "unknown" ) : mUserName );
mPilotDeviceLabel->setText( mPilotDevice.isEmpty() ? i18n( "unknown" ) : mPilotDevice );
- mDaemonStatusLabel->setText( mDaemonStatus );
+ mDaemonStatusLabel->setText( mDaemontqStatus );
mConduitsLabel->setText( mConduits.join( ", " ) );
} else {
mSyncTimeLabel->setText( i18n( "No information available (Daemon not running?)" ) );
@@ -194,7 +194,7 @@ void SummaryWidget::updateView()
void SummaryWidget::showSyncLog( const TQString &filename )
{
- KDialogBase dlg( this, 0, true, TQString::null, KDialogBase::Ok, KDialogBase::Ok );
+ KDialogBase dlg( this, 0, true, TQString(), KDialogBase::Ok, KDialogBase::Ok );
dlg.setCaption( i18n( "KPilot HotSync Log" ) );
TQTextEdit *edit = new TQTextEdit( dlg.makeVBoxMainWidget() );
diff --git a/kontact/plugins/kpilot/summarywidget.h b/kontact/plugins/kpilot/summarywidget.h
index 09b3e77d..cfb87ae5 100644
--- a/kontact/plugins/kpilot/summarywidget.h
+++ b/kontact/plugins/kpilot/summarywidget.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 SUMMARYWIDGET_H
@@ -45,10 +45,11 @@ class KURLLabel;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
- SummaryWidget( TQWidget *parent, const char *name = 0 );
+ SummaryWidget( TQWidget *tqparent, const char *name = 0 );
virtual ~SummaryWidget();
int summaryHeight() const { return 1; }
@@ -84,7 +85,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
TQGridLayout *mLayout;
TQDateTime mLastSyncTime;
- TQString mDaemonStatus;
+ TQString mDaemontqStatus;
TQStringList mConduits;
TQString mSyncLog;
TQString mUserName;
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 0b0a98a3..07a8aebd 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -17,8 +17,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 <tqgroupbox.h>
@@ -49,15 +49,15 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kontactknt( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_kontactknt( TQWidget *tqparent, const char * )
{
- return new KCMKontactKNT( parent, "kcmkontactknt" );
+ return new KCMKontactKNT( tqparent, "kcmkontactknt" );
}
}
-NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *parent )
+NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWidget *tqparent )
: KDialogBase( Plain, i18n( "New News Feed" ), Ok | Cancel,
- Ok, parent, 0, true, true )
+ Ok, tqparent, 0, true, true )
{
TQWidget *page = plainPage();
TQGridLayout *tqlayout = new TQGridLayout( page, 2, 3, marginHint(),
@@ -103,17 +103,17 @@ TQString NewsEditDialog::url() const
return mURL->text();
}
-class NewsItem : public QListViewItem
+class NewsItem : public TQListViewItem
{
public:
- NewsItem( TQListView *parent, const TQString& title, const TQString& url, bool custom )
- : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom )
+ NewsItem( TQListView *tqparent, const TQString& title, const TQString& url, bool custom )
+ : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom )
{
setText( 0, mTitle );
}
- NewsItem( TQListViewItem *parent, const TQString& title, const TQString& url, bool custom )
- : TQListViewItem( parent ), mTitle( title ), mUrl( url ), mCustom( custom )
+ NewsItem( TQListViewItem *tqparent, const TQString& title, const TQString& url, bool custom )
+ : TQListViewItem( tqparent ), mTitle( title ), mUrl( url ), mCustom( custom )
{
setText( 0, mTitle );
}
@@ -128,8 +128,8 @@ class NewsItem : public QListViewItem
bool mCustom;
};
-KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMKontactKNT::KCMKontactKNT( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
initGUI();
@@ -153,22 +153,22 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
void KCMKontactKNT::loadNews()
{
- TQValueVector<TQListViewItem*> parents;
+ TQValueVector<TQListViewItem*> tqparents;
TQValueVector<TQListViewItem*>::Iterator it;
- parents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) );
- parents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) );
- parents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) );
- parents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) );
- parents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) );
- parents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) );
+ tqparents.append( new TQListViewItem( mAllNews, i18n( "Arts" ) ) );
+ tqparents.append( new TQListViewItem( mAllNews, i18n( "Business" ) ) );
+ tqparents.append( new TQListViewItem( mAllNews, i18n( "Computers" ) ) );
+ tqparents.append( new TQListViewItem( mAllNews, i18n( "Misc" ) ) );
+ tqparents.append( new TQListViewItem( mAllNews, i18n( "Recreation" ) ) );
+ tqparents.append( new TQListViewItem( mAllNews, i18n( "Society" ) ) );
- for ( it = parents.begin(); it != parents.end(); ++it )
+ for ( it = tqparents.begin(); it != tqparents.end(); ++it )
(*it)->setSelectable( false );
for ( int i = 0; i < DEFAULT_NEWSSOURCES; ++i ) {
NewsSourceData data = NewsSourceDefault[ i ];
- new NewsItem( parents[ data.category() ], data.name(), data.url(), false );
+ new NewsItem( tqparents[ data.category() ], data.name(), data.url(), false );
mFeedMap.insert( data.url(), data.name() );
}
}
@@ -271,7 +271,7 @@ void KCMKontactKNT::deleteFeed()
if ( !item )
return;
- if ( mCustomFeeds.find( item ) == mCustomFeeds.end() )
+ if ( mCustomFeeds.tqfind( item ) == mCustomFeeds.end() )
return;
mCustomFeeds.remove( item );
@@ -317,7 +317,7 @@ void KCMKontactKNT::allCurrentChanged( TQListViewItem *item )
bool delState = false;
if ( newsItem && newsItem->isSelected() ) {
addState = true;
- delState = (mCustomFeeds.find( newsItem ) != mCustomFeeds.end());
+ delState = (mCustomFeeds.tqfind( newsItem ) != mCustomFeeds.end());
}
mAddButton->setEnabled( addState );
@@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI()
mSelectedNews->setFullWidth( true );
tqlayout->addWidget( mSelectedNews, 0, 2 );
- TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical,
+ TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical,
i18n( "News Feed Settings" ), this );
TQGridLayout *boxLayout = new TQGridLayout( box->tqlayout(), 2, 3,
diff --git a/kontact/plugins/newsticker/kcmkontactknt.h b/kontact/plugins/newsticker/kcmkontactknt.h
index a8572b8e..2ec21f86 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.h
+++ b/kontact/plugins/newsticker/kcmkontactknt.h
@@ -17,8 +17,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 KCMKONTACTKNT_H
@@ -27,7 +27,7 @@
#include <kcmodule.h>
class TQListViewItem;
-class QSpinxBox;
+class TQSpinxBox;
class KAboutData;
class KListView;
@@ -38,9 +38,10 @@ class NewsItem;
class KCMKontactKNT : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMKontactKNT( TQWidget *parent = 0, const char *name = 0 );
+ KCMKontactKNT( TQWidget *tqparent = 0, const char *name = 0 );
virtual void load();
virtual void save();
@@ -85,9 +86,10 @@ class KCMKontactKNT : public KCModule
class NewsEditDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- NewsEditDialog( const TQString&, const TQString&, TQWidget *parent );
+ NewsEditDialog( const TQString&, const TQString&, TQWidget *tqparent );
TQString title() const;
TQString url() const;
diff --git a/kontact/plugins/newsticker/newsfeeds.h b/kontact/plugins/newsticker/newsfeeds.h
index 6f8e7fa4..b092469a 100644
--- a/kontact/plugins/newsticker/newsfeeds.h
+++ b/kontact/plugins/newsticker/newsfeeds.h
@@ -17,8 +17,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 NEWSFEEDS_H
@@ -37,8 +37,8 @@ class NewsSourceData
Recreation, Society };
NewsSourceData( const TQString &name = I18N_NOOP( "Unknown" ),
- const TQString &url = TQString::null,
- const TQString &icon = TQString::null,
+ const TQString &url = TQString(),
+ const TQString &icon = TQString(),
const Category category= Computers )
: mName( name ), mURL( url ), mIcon( icon ), mCategory( category )
{
@@ -71,12 +71,12 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("Internet.com Business"),
TQString::tqfromLatin1("http://headlines.internet.com/internetnews/bus-news/news.rss"),
- TQString::null,
+ TQString(),
NewsSourceData::Business ),
NewsSourceData(
TQString::tqfromLatin1("TradeSims"),
TQString::tqfromLatin1("http://www.tradesims.com/AEX.rdf"),
- TQString::null,
+ TQString(),
NewsSourceData::Business ),
// Computers ----------
NewsSourceData(
@@ -87,7 +87,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("KDE France"),
TQString::tqfromLatin1("http://www.kde-france.org/backend-breves.php3"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("FreeBSD Project News"),
@@ -119,7 +119,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("GNOME News"),
TQString::tqfromLatin1("http://www.gnomedesktop.org/node/feed"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("Slashdot"),
@@ -149,7 +149,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("Jabber News"),
TQString::tqfromLatin1("http://www.jabber.org/news/rss.xml"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("Freshmeat"),
@@ -194,7 +194,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("Linux Game Tome"),
TQString::tqfromLatin1("http://happypenguin.org/html/news.rdf"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("Mozilla"),
@@ -209,12 +209,12 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("Daemon News"),
TQString::tqfromLatin1("http://daily.daemonnews.org/ddn.rdf.php3"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("use Perl;"),
TQString::tqfromLatin1("http://use.perl.org/useperl.rdf"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("Root prompt"),
@@ -249,7 +249,7 @@ static NewsSourceData NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
NewsSourceData(
TQString::tqfromLatin1("zez.org - about code "),
TQString::tqfromLatin1("http://zez.org/article/rssheadlines"),
- TQString::null,
+ TQString(),
NewsSourceData::Computers ),
NewsSourceData(
TQString::tqfromLatin1("BSDatwork.com"),
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 5283d84d..adfc65fb 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -17,8 +17,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 <tqclipboard.h>
@@ -41,8 +41,8 @@
#include "summarywidget.h"
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
- : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+ : Kontact::Summary( tqparent, name ),
DCOPObject( "NewsTickerPlugin" ), mLayout( 0 ), mFeedCounter( 0 )
{
TQVBoxLayout *vlay = new TQVBoxLayout( this, 3, 3 );
@@ -60,7 +60,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
if ( !kapp->dcopClient()->isApplicationRegistered( "rssservice" ) ) {
if ( KApplication::startServiceByDesktopName( "rssservice", TQStringList(), &error, &appID ) ) {
TQLabel *label = new TQLabel( i18n( "No rss dcop service available.\nYou need rssservice to use this plugin." ), this );
- vlay->addWidget( label, Qt::AlignHCenter );
+ vlay->addWidget( label, TQt::AlignHCenter );
dcopAvailable = false;
}
}
@@ -175,7 +175,7 @@ void SummaryWidget::documentUpdated( DCOPRef feedRef )
artRef.call( "title()" ).get( title );
artRef.call( "link()" ).get( url );
- QPair<TQString, KURL> article(title, KURL( url ));
+ TQPair<TQString, KURL> article(title, KURL( url ));
map.append( article );
}
@@ -300,7 +300,7 @@ void SummaryWidget::rmbMenu( const TQString& url )
menu.insertItem( i18n( "Copy URL to Clipboard" ) );
int id = menu.exec( TQCursor::pos() );
if ( id != -1 )
- kapp->clipboard()->setText( url, QClipboard::Clipboard );
+ kapp->clipboard()->setText( url, TQClipboard::Clipboard );
}
bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
@@ -310,7 +310,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( e->type() == TQEvent::Enter )
emit message( label->url() );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/newsticker/summarywidget.h b/kontact/plugins/newsticker/summarywidget.h
index bfea340e..7f30ca26 100644
--- a/kontact/plugins/newsticker/summarywidget.h
+++ b/kontact/plugins/newsticker/summarywidget.h
@@ -17,8 +17,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 SUMMARYWIDGET_H
@@ -41,7 +41,7 @@ class TQLabel;
class DCOPRef;
class KURLLabel;
-typedef TQValueList< QPair<TQString, KURL> > ArticleMap;
+typedef TQValueList< TQPair<TQString, KURL> > ArticleMap;
typedef struct {
DCOPRef ref;
@@ -56,10 +56,11 @@ typedef TQValueList<Feed> FeedList;
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
- SummaryWidget( TQWidget *parent, const char *name = 0 );
+ SummaryWidget( TQWidget *tqparent, const char *name = 0 );
int summaryHeight() const;
TQStringList configModules() const;
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 183a2e12..b3a67127 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.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 <tqbuttongroup.h>
@@ -43,14 +43,14 @@
extern "C"
{
- KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * )
+ KDE_EXPORT KCModule *create_sdsummary( TQWidget *tqparent, const char * )
{
- return new KCMSDSummary( parent, "kcmsdsummary" );
+ return new KCMSDSummary( tqparent, "kcmsdsummary" );
}
}
-KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMSDSummary::KCMSDSummary( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
initGUI();
diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h
index 6fbb8aee..4369797f 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.h
+++ b/kontact/plugins/specialdates/kcmsdsummary.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 KCMSDSUMMARY_H
@@ -36,9 +36,10 @@ class KAboutData;
class KCMSDSummary : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMSDSummary( TQWidget *parent = 0, const char *name = 0 );
+ KCMSDSummary( TQWidget *tqparent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index bd1fa73b..cd4e40d7 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.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 <tqcursor.h>
@@ -77,9 +77,9 @@ class SDEntry
}
};
-SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
+SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent,
const char *name )
- : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 )
+ : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 )
{
// Create the Summary Layout
TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 );
@@ -250,7 +250,7 @@ void SDSummaryWidget::updateView()
TQString anniversaryAsString =
(*it).custom( "KADDRESSBOOK" , "X-Anniversary" );
if ( !anniversaryAsString.isEmpty() ) {
- TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate );
+ TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate );
if ( anniversary.isValid() && mShowAnniversariesFromKAB ) {
SDEntry entry;
entry.type = IncidenceTypeContact;
@@ -502,7 +502,7 @@ void SDSummaryWidget::updateView()
urlLabel->installEventFilter( this );
urlLabel->setURL( (*addrIt).addressee.uid() );
urlLabel->setText( (*addrIt).addressee.realName() );
- urlLabel->setTextFormat( Qt::RichText );
+ urlLabel->setTextFormat( TQt::RichText );
mLayout->addWidget( urlLabel, counter, 4 );
mLabels.append( urlLabel );
@@ -513,7 +513,7 @@ void SDSummaryWidget::updateView()
} else {
label = new TQLabel( this );
label->setText( (*addrIt).summary );
- label->setTextFormat( Qt::RichText );
+ label->setTextFormat( TQt::RichText );
mLayout->addWidget( label, counter, 4 );
mLabels.append( label );
if ( !(*addrIt).desc.isEmpty() ) {
@@ -556,9 +556,9 @@ void SDSummaryWidget::updateView()
void SDSummaryWidget::mailContact( const TQString &uid )
{
KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true );
- TQString email = ab->tqfindByUid( uid ).fullEmail();
+ TQString email = ab->findByUid( uid ).fullEmail();
- kapp->invokeMailer( email, TQString::null );
+ kapp->invokeMailer( email, TQString() );
}
void SDSummaryWidget::viewContact( const TQString &uid )
@@ -597,7 +597,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
if ( e->type() == TQEvent::Enter )
emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h
index 5c52c77c..939ca5bb 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.h
+++ b/kontact/plugins/specialdates/sdsummarywidget.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 SDSUMMARYWIDGET_H
@@ -43,9 +43,10 @@ class TQLabel;
class SDSummaryWidget : public Kontact::Summary
{
Q_OBJECT
+ TQ_OBJECT
public:
- SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
+ SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent,
const char *name = 0 );
TQStringList configModules() const;
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 70cfa521..9d0b60cf 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.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 <kaboutdata.h>
diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h
index eb3a514f..fc359802 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.h
+++ b/kontact/plugins/specialdates/specialdates_plugin.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 SPECIALDATES_PLUGIN_H
diff --git a/kontact/plugins/summary/dropwidget.cpp b/kontact/plugins/summary/dropwidget.cpp
index 5b603982..300d7993 100644
--- a/kontact/plugins/summary/dropwidget.cpp
+++ b/kontact/plugins/summary/dropwidget.cpp
@@ -23,8 +23,8 @@
#include "dropwidget.h"
-DropWidget::DropWidget( TQWidget *parent, const char *name )
- : TQWidget( parent, name )
+DropWidget::DropWidget( TQWidget *tqparent, const char *name )
+ : TQWidget( tqparent, name )
{
setAcceptDrops( true );
}
@@ -36,8 +36,8 @@ void DropWidget::dragEnterEvent( TQDragEnterEvent *event )
void DropWidget::dropEvent( TQDropEvent *event )
{
- int tqalignment = ( event->pos().x() < (width() / 2) ? Qt::AlignLeft : Qt::AlignRight );
- tqalignment |= ( event->pos().y() < (height() / 2) ? Qt::AlignTop : Qt::AlignBottom );
+ int tqalignment = ( event->pos().x() < (width() / 2) ? TQt::AlignLeft : TQt::AlignRight );
+ tqalignment |= ( event->pos().y() < (height() / 2) ? TQt::AlignTop : TQt::AlignBottom );
emit summaryWidgetDropped( this, event->source(), tqalignment );
}
diff --git a/kontact/plugins/summary/dropwidget.h b/kontact/plugins/summary/dropwidget.h
index 41c892ea..ee430d90 100644
--- a/kontact/plugins/summary/dropwidget.h
+++ b/kontact/plugins/summary/dropwidget.h
@@ -24,12 +24,13 @@
#include <tqwidget.h>
-class DropWidget : public QWidget
+class DropWidget : public TQWidget
{
Q_OBJECT
+ TQ_OBJECT
public:
- DropWidget( TQWidget *parent, const char *name = 0 );
+ DropWidget( TQWidget *tqparent, const char *name = 0 );
signals:
void summaryWidgetDropped( TQWidget *target, TQWidget *widget, int tqalignment );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 22d27f47..ba78c226 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.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 <kaboutdata.h>
@@ -43,16 +43,16 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kontactsummary( TQWidget *parent, const char * ) {
- return new KCMKontactSummary( parent, "kcmkontactsummary" );
+ KDE_EXPORT KCModule *create_kontactsummary( TQWidget *tqparent, const char * ) {
+ return new KCMKontactSummary( tqparent, "kcmkontactsummary" );
}
}
-class PluginItem : public QCheckListItem
+class PluginItem : public TQCheckListItem
{
public:
- PluginItem( KPluginInfo *info, KListView *parent )
- : TQCheckListItem( parent, TQString::null, TQCheckListItem::CheckBox ),
+ PluginItem( KPluginInfo *info, KListView *tqparent )
+ : TQCheckListItem( tqparent, TQString(), TQCheckListItem::CheckBox ),
mInfo( info )
{
TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
@@ -71,15 +71,15 @@ class PluginItem : public QCheckListItem
else if ( column == 1 )
return mInfo->comment();
else
- return TQString::null;
+ return TQString();
}
private:
KPluginInfo *mInfo;
};
-PluginView::PluginView( TQWidget *parent, const char *name )
- : KListView( parent, name )
+PluginView::PluginView( TQWidget *tqparent, const char *name )
+ : KListView( tqparent, name )
{
addColumn( i18n( "Name" ) );
setAllColumnsShowFocus( true );
@@ -90,8 +90,8 @@ PluginView::~PluginView()
{
}
-KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
- : KCModule( parent, name )
+KCMKontactSummary::KCMKontactSummary( TQWidget *tqparent, const char *name )
+ : KCModule( tqparent, name )
{
TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
@@ -157,7 +157,7 @@ void KCMKontactSummary::load()
if ( var.toBool() == true ) {
PluginItem *item = new PluginItem( *it, mPluginView );
- if ( activeSummaries.find( (*it)->pluginName() ) != activeSummaries.end() )
+ if ( activeSummaries.tqfind( (*it)->pluginName() ) != activeSummaries.end() )
item->setOn( true );
}
}
diff --git a/kontact/plugins/summary/kcmkontactsummary.h b/kontact/plugins/summary/kcmkontactsummary.h
index fd1f983d..4545f16d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.h
+++ b/kontact/plugins/summary/kcmkontactsummary.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 KCMKONTACTSUMMARY_H
@@ -33,18 +33,20 @@ class KPluginInfo;
class PluginView : public KListView
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginView( TQWidget *parent, const char *name = 0 );
+ PluginView( TQWidget *tqparent, const char *name = 0 );
~PluginView();
};
class KCMKontactSummary : public KCModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KCMKontactSummary( TQWidget *parent = 0, const char *name = 0 );
+ KCMKontactSummary( TQWidget *tqparent = 0, const char *name = 0 );
virtual void load();
virtual void save();
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index e7c161ea..f28ce79e 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -58,7 +58,7 @@
#include "summaryview_part.h"
#include "broadcaststatus.h"
-using KPIM::BroadcasStatus;
+using KPIM::BroadcastqStatus;
namespace Kontact
{
@@ -67,8 +67,8 @@ namespace Kontact
SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
const KAboutData *aboutData,
- TQObject *parent, const char *name )
- : KParts::ReadOnlyPart( parent, name ),
+ TQObject *tqparent, const char *name )
+ : KParts::ReadOnlyPart( tqparent, name ),
mCore( core ), mFrame( 0 ), mConfigAction( 0 )
{
setInstance( new KInstance( aboutData ) );
@@ -168,7 +168,7 @@ void SummaryViewPart::updateWidgets()
TQValueList<Kontact::Plugin*>::ConstIterator it = plugins.begin();
for ( ; it != end; ++it ) {
Kontact::Plugin *plugin = *it;
- if ( activeSummaries.find( plugin->identifier() ) == activeSummaries.end() )
+ if ( activeSummaries.tqfind( plugin->identifier() ) == activeSummaries.end() )
continue;
Kontact::Summary *summary = plugin->createSummaryWidget( mFrame );
@@ -177,7 +177,7 @@ void SummaryViewPart::updateWidgets()
mSummaries.insert( plugin->identifier(), summary );
connect( summary, TQT_SIGNAL( message( const TQString& ) ),
- BroadcasStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
+ BroadcastqStatus::instance(), TQT_SLOT( seStatusMsg( const TQString& ) ) );
connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
@@ -197,13 +197,13 @@ void SummaryViewPart::updateWidgets()
{
TQStringList::Iterator strIt;
for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) {
- if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) {
+ if ( loadedSummaries.tqfind( *strIt ) == loadedSummaries.end() ) {
strIt = mLeftColumnSummaries.remove( strIt );
--strIt;
}
}
for ( strIt = mRightColumnSummaries.begin(); strIt != mRightColumnSummaries.end(); ++strIt ) {
- if ( loadedSummaries.find( *strIt ) == loadedSummaries.end() ) {
+ if ( loadedSummaries.tqfind( *strIt ) == loadedSummaries.end() ) {
strIt = mRightColumnSummaries.remove( strIt );
--strIt;
}
@@ -223,12 +223,12 @@ void SummaryViewPart::updateWidgets()
TQStringList::Iterator strIt;
for ( strIt = mLeftColumnSummaries.begin(); strIt != mLeftColumnSummaries.end(); ++strIt ) {
- if ( mSummaries.find( *strIt ) != mSummaries.end() )
+ if ( mSummaries.tqfind( *strIt ) != mSummaries.end() )
mLeftColumn->addWidget( mSummaries[ *strIt ] );
}
for ( strIt = mRightColumnSummaries.begin(); strIt != mRightColumnSummaries.end(); ++strIt ) {
- if ( mSummaries.find( *strIt ) != mSummaries.end() )
+ if ( mSummaries.tqfind( *strIt ) != mSummaries.end() )
mRightColumn->addWidget( mSummaries[ *strIt ] );
}
@@ -266,17 +266,17 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
if ( target == mFrame ) {
int pos = 0;
- if ( tqalignment & Qt::AlignTop )
+ if ( tqalignment & TQt::AlignTop )
pos = 0;
- if ( tqalignment & Qt::AlignLeft ) {
- if ( tqalignment & Qt::AlignBottom )
+ if ( tqalignment & TQt::AlignLeft ) {
+ if ( tqalignment & TQt::AlignBottom )
pos = mLeftColumnSummaries.count();
mLeftColumn->insertWidget( pos, widget );
mLeftColumnSummaries.insert( mLeftColumnSummaries.at( pos ), widgetName( widget ) );
} else {
- if ( tqalignment & Qt::AlignBottom )
+ if ( tqalignment & TQt::AlignBottom )
pos = mRightColumnSummaries.count();
mRightColumn->insertWidget( pos, widget );
@@ -288,7 +288,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
int targetPos = mLeftColumn->findWidget( target );
if ( targetPos != -1 ) {
- if ( tqalignment == Qt::AlignBottom )
+ if ( tqalignment == TQt::AlignBottom )
targetPos++;
mLeftColumn->insertWidget( targetPos, widget );
@@ -296,7 +296,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
} else {
targetPos = mRightColumn->findWidget( target );
- if ( tqalignment == Qt::AlignBottom )
+ if ( tqalignment == TQt::AlignBottom )
targetPos++;
mRightColumn->insertWidget( targetPos, widget );
@@ -428,7 +428,7 @@ TQString SummaryViewPart::widgetName( TQWidget *widget ) const
return it.key();
}
- return TQString::null;
+ return TQString();
}
#include "summaryview_part.moc"
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 38e68b15..b04b944a 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -52,11 +52,12 @@ class KCMultiDialog;
class SummaryViewPart : public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
SummaryViewPart( Kontact::Core *core, const char *widgetName,
const KAboutData *aboutData,
- TQObject *parent = 0, const char *name = 0 );
+ TQObject *tqparent = 0, const char *name = 0 );
~SummaryViewPart();
public slots:
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 82e3db96..44d7c6d8 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -35,6 +35,7 @@ class SummaryViewPart;
class SummaryView : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
SummaryView( Kontact::Core *core, const char *name, const TQStringList& );
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index b921d025..d8cfe9e6 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.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 "test_part.h"
@@ -41,8 +41,8 @@
#include <kservice.h>
-TestPart::TestPart(TQObject *parent, const char *name) // ## tqparentWidget
- : KParts::ReadOnlyPart(parent, name)
+TestPart::TestPart(TQObject *tqparent, const char *name) // ## tqparentWidget
+ : KParts::ReadOnlyPart(tqparent, name)
{
setInstance( new KInstance("testpart") ); // ## memleak
m_edit = new TQTextEdit;
@@ -85,7 +85,7 @@ bool TestPart::connectToAddressBook()
{
TQString error;
TQCString dcopService;
- int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString::null, TQString::null, &error, &dcopService );
+ int result = KDCOPServiceStarter::self()->findServiceFor( "DCOP/AddressBook", TQString(), TQString(), &error, &dcopService );
if ( result != 0 ) {
// You might want to show "error" (if not empty) here, using e.g. KMessageBox
return false;
diff --git a/kontact/plugins/test/test_part.h b/kontact/plugins/test/test_part.h
index 8a80dcb4..7f14aed2 100644
--- a/kontact/plugins/test/test_part.h
+++ b/kontact/plugins/test/test_part.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 TEST_PART_H
#define TEST_PART_H
@@ -34,10 +34,11 @@ class KAddressBookIface_stub;
class TestPart : public KParts::ReadOnlyPart
{
Q_OBJECT
+ TQ_OBJECT
public:
- TestPart(TQObject *parent=0, const char *name=0);
+ TestPart(TQObject *tqparent=0, const char *name=0);
~TestPart();
protected:
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 93001d2f..4e033fcd 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.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 <kmessagebox.h>
#include <kaction.h>
diff --git a/kontact/plugins/test/test_plugin.h b/kontact/plugins/test/test_plugin.h
index 9d1a0e8e..8a22b33a 100644
--- a/kontact/plugins/test/test_plugin.h
+++ b/kontact/plugins/test/test_plugin.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 TEST_PLUGIN_H
#define TEST_PLUGIN_H
@@ -34,6 +34,7 @@ class TestPart;
class TestPlugin : public Kontact::Plugin
{
Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index abe11764..bc468e84 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -17,8 +17,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 <tqimage.h>
#include <tqlabel.h>
@@ -38,12 +38,12 @@
#include "summarywidget.h"
-SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
- : Kontact::Summary( parent, name ),
+SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name )
+ : Kontact::Summary( tqparent, name ),
DCOPObject( "WeatherSummaryWidget" ), mProc( 0 )
{
mLayout = new TQVBoxLayout( this, 3, 3 );
- mLayout->tqsetAlignment( Qt::AlignTop );
+ mLayout->tqsetAlignment( TQt::AlignTop );
TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
@@ -55,7 +55,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) {
if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) {
TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this );
- mLayout->addWidget( label, Qt::AlignHCenter | AlignVCenter );
+ mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter );
serviceAvailable = false;
}
}
@@ -191,7 +191,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e )
emit message(
i18n( "View Weather Report for Station" ) );
if ( e->type() == TQEvent::Leave )
- emit message( TQString::null );
+ emit message( TQString() );
}
return Kontact::Summary::eventFilter( obj, e );
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 0baeefc0..be1c5b9c 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -17,8 +17,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 SUMMARYWIDGET_H
@@ -87,9 +87,10 @@ class WeatherData
class SummaryWidget : public Kontact::Summary, public DCOPObject
{
Q_OBJECT
+// TQ_OBJECT
K_DCOP
public:
- SummaryWidget( TQWidget *parent, const char *name = 0 );
+ SummaryWidget( TQWidget *tqparent, const char *name = 0 );
TQStringList configModules() const;
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index e671ddeb..e7fef654 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.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 "aboutdialog.h"
@@ -68,7 +68,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon,
KIcon::Desktop, 48 );
- TQFrame *topFrame = addPage( title, TQString::null, pixmap );
+ TQFrame *topFrame = addPage( title, TQString(), pixmap );
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
@@ -165,7 +165,7 @@ void AboutDialog::addLicenseText( const KAboutData *about )
TQString title = i18n( "%1 License" ).arg( about->programName() );
- TQFrame *topFrame = addPage( title, TQString::null, pixmap );
+ TQFrame *topFrame = addPage( title, TQString(), pixmap );
TQBoxLayout *topLayout = new TQVBoxLayout( topFrame );
KTextBrowser *textBrowser = new KTextBrowser( topFrame );
diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h
index ab8ab1a8..c5faa503 100644
--- a/kontact/src/aboutdialog.h
+++ b/kontact/src/aboutdialog.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 KONTACT_ABOUTDIALOG_H
#define KONTACT_ABOUTDIALOG_H
@@ -34,6 +34,7 @@ class Plugin;
class AboutDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
AboutDialog( Kontact::Core *core, const char *name = 0 );
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index b54454e1..7e4d027e 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -92,8 +92,8 @@ class PluginProxy
using namespace Kontact;
-EntryItem::EntryItem( Navigator *parent, Kontact::Plugin *plugin )
- : TQListBoxItem( parent ),
+EntryItem::EntryItem( Navigator *tqparent, Kontact::Plugin *plugin )
+ : TQListBoxItem( tqparent ),
mPlugin( plugin ),
mHasHover( false ),
mPaintActive( false )
@@ -137,7 +137,7 @@ int EntryItem::width( const TQListBox *listbox ) const
if ( navigator()->viewMode() == SmallIcons )
w += listbox->fontMetrics().width( text() );
else
- w = QMAX( w, listbox->fontMetrics().width( text() ) );
+ w = TQMAX( w, listbox->fontMetrics().width( text() ) );
}
return w + ( KDialog::marginHint() * 2 );
}
@@ -149,7 +149,7 @@ int EntryItem::height( const TQListBox *listbox ) const
h = (int)navigator()->viewMode() + 4;
if ( navigator()->showText() ) {
if ( navigator()->viewMode() == SmallIcons || !navigator()->showIcons() )
- h = QMAX( h, listbox->fontMetrics().lineSpacing() ) + KDialog::spacingHint() * 2;
+ h = TQMAX( h, listbox->fontMetrics().lineSpacing() ) + KDialog::spacingHint() * 2;
else
h = (int)navigator()->viewMode() + listbox->fontMetrics().lineSpacing() + 4;
}
@@ -250,8 +250,8 @@ void EntryItem::setPaintActive( bool paintActive )
mPaintActive = paintActive;
}
-Navigator::Navigator( IconSidePane *parent, const char *name )
- : KListBox( parent, name ), mSidePane( parent ),
+Navigator::Navigator( IconSidePane *tqparent, const char *name )
+ : KListBox( tqparent, name ), mSidePane( tqparent ),
mShowIcons( true ), mShowText( true )
{
mMouseOn = 0;
@@ -399,7 +399,7 @@ void Navigator::resizeEvent( TQResizeEvent *event )
void Navigator::enterEvent( TQEvent *event )
{
- // work around Qt behaviour: onItem is not emmitted in enterEvent()
+ // work around TQt behaviour: onItem is not emmitted in enterEvent()
KListBox::enterEvent( event );
emit onItem( itemAt( mapFromGlobal( TQCursor::pos() ) ) );
}
@@ -535,8 +535,8 @@ void Navigator::slotMouseOff()
slotMouseOn( 0 );
}
-IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name )
- : SidePaneBase( core, parent, name )
+IconSidePane::IconSidePane( Core *core, TQWidget *tqparent, const char *name )
+ : SidePaneBase( core, tqparent, name )
{
mNavigator = new Navigator( this );
connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ),
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index a5aad36a..d7cc532d 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -48,7 +48,7 @@ enum IconViewMode { LargeIcons = 48, NormalIcons = 32, SmallIcons = 22, ShowText
A TQListBoxPixmap Square Box with an optional icon and a text
underneath.
*/
-class EntryItem : public QListBoxItem
+class EntryItem : public TQListBoxItem
{
public:
EntryItem( Navigator *, Kontact::Plugin * );
@@ -86,13 +86,13 @@ class EntryItem : public QListBoxItem
/**
* Tooltip that changes text depending on the item it is above.
- * Compliments of "Practical Qt" by Dalheimer, Petersen et al.
+ * Compliments of "Practical TQt" by Dalheimer, Petersen et al.
*/
-class EntryItemToolTip : public QToolTip
+class EntryItemToolTip : public TQToolTip
{
public:
- EntryItemToolTip( TQListBox* parent )
- : TQToolTip( parent->viewport() ), mListBox( parent )
+ EntryItemToolTip( TQListBox* tqparent )
+ : TQToolTip( tqparent->viewport() ), mListBox( tqparent )
{}
protected:
void maybeTip( const TQPoint& p ) {
@@ -118,8 +118,9 @@ class EntryItemToolTip : public QToolTip
class Navigator : public KListBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- Navigator( IconSidePane *parent = 0, const char *name = 0 );
+ Navigator( IconSidePane *tqparent = 0, const char *name = 0 );
virtual void setSelected( TQListBoxItem *, bool );
@@ -173,8 +174,9 @@ class Navigator : public KListBox
class IconSidePane : public SidePaneBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- IconSidePane( Core *core, TQWidget *parent, const char *name = 0 );
+ IconSidePane( Core *core, TQWidget *tqparent, const char *name = 0 );
~IconSidePane();
virtual void indicateForegrunding( Kontact::Plugin* );
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 2162ffa0..2e7c61f8 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.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 "kcmkontact.h"
@@ -42,16 +42,16 @@
extern "C"
{
- KDE_EXPORT KCModule *create_kontactconfig( TQWidget *parent, const char * ) {
- return new KcmKontact( parent, "kcmkontact" );
+ KDE_EXPORT KCModule *create_kontactconfig( TQWidget *tqparent, const char * ) {
+ return new KcmKontact( tqparent, "kcmkontact" );
}
}
-class PluginItem : public QListViewItem
+class PluginItem : public TQListViewItem
{
public:
- PluginItem( TQListView *parent, const KService::Ptr &ptr )
- : TQListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ),
+ PluginItem( TQListView *tqparent, const KService::Ptr &ptr )
+ : TQListViewItem( tqparent, ptr->name(), ptr->comment(), ptr->library() ),
mPtr( ptr )
{
}
@@ -65,8 +65,8 @@ class PluginItem : public QListViewItem
KService::Ptr mPtr;
};
-KcmKontact::KcmKontact( TQWidget *parent, const char *name )
- : KPrefsModule( Kontact::Prefs::self(), parent, name )
+KcmKontact::KcmKontact( TQWidget *tqparent, const char *name )
+ : KPrefsModule( Kontact::Prefs::self(), tqparent, name )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
TQBoxLayout *pluginStartupLayout = new TQHBoxLayout( topLayout );
@@ -100,10 +100,10 @@ const KAboutData* KcmKontact::aboutData() const
}
-PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent )
+PluginSelection::PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent )
{
mItem = item;
- mPluginCombo = new TQComboBox( parent );
+ mPluginCombo = new TQComboBox( tqparent );
connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
}
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index ed926db4..1d3f04a6 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.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 KCMKONTACT_H
@@ -39,9 +39,10 @@ class KListView;
class KcmKontact : public KPrefsModule
{
Q_OBJECT
+ TQ_OBJECT
public:
- KcmKontact( TQWidget *parent = 0, const char *name = 0 );
+ KcmKontact( TQWidget *tqparent = 0, const char *name = 0 );
virtual const KAboutData* aboutData() const;
};
@@ -49,9 +50,10 @@ class KcmKontact : public KPrefsModule
class PluginSelection : public KPrefsWid
{
Q_OBJECT
+ TQ_OBJECT
public:
- PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *parent );
+ PluginSelection( KConfigSkeleton::ItemString *item, TQWidget *tqparent );
~PluginSelection();
void readConfig();
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index ab613466..0e56f918 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -87,8 +87,8 @@ using namespace Kontact;
class SettingsDialogWrapper : public KSettings::Dialog
{
public:
- SettingsDialogWrapper( ContentInListView content, TQWidget * parent = 0 )
- : KSettings::Dialog( content, parent, 0 )
+ SettingsDialogWrapper( ContentInListView content, TQWidget * tqparent = 0 )
+ : KSettings::Dialog( content, tqparent, 0 )
{
}
@@ -185,9 +185,9 @@ void MainWindow::initObject()
showTip( false );
// done initializing
- slotShowStatusMsg( TQString::null );
+ slotShowStatusMsg( TQString() );
- connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+ connect( KPIM::BroadcastqStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
this, TQT_SLOT( slotShowStatusMsg( const TQString& ) ) );
// launch commandline specified module if any
@@ -787,7 +787,7 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
return;
}
- KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) );
+ KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
KParts::Part *part = plugin->part();
@@ -805,12 +805,12 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
TQWidget *tqfocusWidget = kapp->tqfocusWidget();
if ( mCurrentPlugin && tqfocusWidget ) {
// save the focus widget only when it belongs to the activated part
- TQWidget *parent = tqfocusWidget->tqparentWidget();
- while ( parent ) {
- if ( parent == mCurrentPlugin->part()->widget() )
+ TQWidget *tqparent = tqfocusWidget->tqparentWidget();
+ while ( tqparent ) {
+ if ( tqparent == mCurrentPlugin->part()->widget() )
mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
- parent = parent->tqparentWidget();
+ tqparent = tqparent->tqparentWidget();
}
}
@@ -1027,7 +1027,7 @@ void MainWindow::updateConfig()
void MainWindow::showAboutDialog()
{
- KApplication::setOverrideCursor( TQCursor( Qt::WaitCursor ) );
+ KApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
if ( !mAboutDialog )
mAboutDialog = new AboutDialog( this );
@@ -1084,7 +1084,7 @@ void MainWindow::slotOpenUrl( const KURL &url )
if ( !url.query().isEmpty() ) {
app = url.query().mid( 1 );
}
- kapp->invokeHelp( TQString::null, app );
+ kapp->invokeHelp( TQString(), app );
}
} else {
new KRun( url, this );
@@ -1101,7 +1101,7 @@ void MainWindow::readProperties( KConfig *config )
for ( ; it != end; ++it ) {
Plugin *plugin = *it;
if ( !plugin->isRunningStandalone() ) {
- TQStringList::ConstIterator activePlugin = activePlugins.find( plugin->identifier() );
+ TQStringList::ConstIterator activePlugin = activePlugins.tqfind( plugin->identifier() );
if ( activePlugin != activePlugins.end() ) {
plugin->readProperties( config );
}
diff --git a/kontact/src/mainwindow.h b/kontact/src/mainwindow.h
index 5d5945b6..6732ed27 100644
--- a/kontact/src/mainwindow.h
+++ b/kontact/src/mainwindow.h
@@ -67,6 +67,7 @@ typedef TQPtrList<KAction> ActionPluginList;
class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public KontactIface
{
Q_OBJECT
+ TQ_OBJECT
public:
MainWindow();
@@ -74,8 +75,8 @@ class MainWindow : public Kontact::Core, public KDCOPServiceStarter, public Kont
// KDCOPServiceStarter interface
virtual int startServiceFor( const TQString& serviceType,
- const TQString& constraint = TQString::null,
- const TQString& preferences = TQString::null,
+ const TQString& constraint = TQString(),
+ const TQString& preferences = TQString(),
TQString *error = 0, TQCString* dcopService = 0,
int flags = 0 );
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 5d440e5f..cb28d119 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.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 "profiledialog.h"
@@ -34,7 +34,7 @@
#include <tqpushbutton.h>
#include <tqstring.h>
-Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialogBase( parent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close )
+Kontact::ProfileDialog::ProfileDialog( TQWidget* tqparent, WFlags flags ) : KDialogBase( tqparent, /*name=*/0, /*modal=*/true, /*caption=*/TQString(), /*buttonMask=*/KDialogBase::Ok|KDialogBase::Close )
{
setWFlags( flags );
setCaption( i18n("Configure Profiles") );
diff --git a/kontact/src/profiledialog.h b/kontact/src/profiledialog.h
index b20a8698..fc9559b5 100644
--- a/kontact/src/profiledialog.h
+++ b/kontact/src/profiledialog.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 KONTACT_PROFILEDIALOG_H
@@ -40,9 +40,10 @@ namespace Kontact {
class ProfileDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- explicit ProfileDialog( TQWidget* parent = 0, WFlags f = 0 );
+ explicit ProfileDialog( TQWidget* tqparent = 0, WFlags f = 0 );
private:
enum ListColumn {
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 804f65e3..deed6f37 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.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 "profilemanager.h"
@@ -131,7 +131,7 @@ Kontact::ProfileManager* Kontact::ProfileManager::self()
return m_self;
}
-Kontact::ProfileManager::ProfileManager( TQObject* parent ) : TQObject( parent )
+Kontact::ProfileManager::ProfileManager( TQObject* tqparent ) : TQObject( tqparent )
{
}
diff --git a/kontact/src/profilemanager.h b/kontact/src/profilemanager.h
index 0b335b95..b7abdcb3 100644
--- a/kontact/src/profilemanager.h
+++ b/kontact/src/profilemanager.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 KONTACT_PROFILEMANAGER_H
@@ -86,9 +86,10 @@ private:
TQString m_originalLocation;
};
-class ProfileManager : public QObject
+class ProfileManager : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
enum ImportError {
SuccessfulImport=0,
@@ -145,7 +146,7 @@ private:
static Kontact::Profile readFromConfiguration( const TQString& configFile, bool isLocal );
- explicit ProfileManager( TQObject* parent = 0 );
+ explicit ProfileManager( TQObject* tqparent = 0 );
void readConfig();
diff --git a/kontact/src/sidepanebase.cpp b/kontact/src/sidepanebase.cpp
index 92a3ce51..486e273b 100644
--- a/kontact/src/sidepanebase.cpp
+++ b/kontact/src/sidepanebase.cpp
@@ -25,8 +25,8 @@
using namespace Kontact;
-SidePaneBase::SidePaneBase( Core *core, TQWidget *parent, const char *name )
- : TQVBox( parent, name ), mCore( core )
+SidePaneBase::SidePaneBase( Core *core, TQWidget *tqparent, const char *name )
+ : TQVBox( tqparent, name ), mCore( core )
{
}
diff --git a/kontact/src/sidepanebase.h b/kontact/src/sidepanebase.h
index 0b4a7a54..77acc66f 100644
--- a/kontact/src/sidepanebase.h
+++ b/kontact/src/sidepanebase.h
@@ -31,11 +31,12 @@ namespace Kontact
class Core;
class Plugin;
-class SidePaneBase : public QVBox
+class SidePaneBase : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- SidePaneBase( Core *core, TQWidget *parent, const char *name = 0 );
+ SidePaneBase( Core *core, TQWidget *tqparent, const char *name = 0 );
virtual ~SidePaneBase();
signals: