summaryrefslogtreecommitdiffstats
path: root/libtdepim/komposer/core
diff options
context:
space:
mode:
Diffstat (limited to 'libtdepim/komposer/core')
-rw-r--r--libtdepim/komposer/core/attachment.cpp1
-rw-r--r--libtdepim/komposer/core/attachment.h1
-rw-r--r--libtdepim/komposer/core/core.cpp31
-rw-r--r--libtdepim/komposer/core/core.h3
-rw-r--r--libtdepim/komposer/core/corewidget.cpp1
-rw-r--r--libtdepim/komposer/core/corewidget.h3
-rw-r--r--libtdepim/komposer/core/editor.cpp1
-rw-r--r--libtdepim/komposer/core/editor.h3
-rw-r--r--libtdepim/komposer/core/plugin.cpp1
-rw-r--r--libtdepim/komposer/core/plugin.h3
-rw-r--r--libtdepim/komposer/core/pluginmanager.cpp29
-rw-r--r--libtdepim/komposer/core/pluginmanager.h3
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp8
-rw-r--r--libtdepim/komposer/core/prefsmodule.h4
-rw-r--r--libtdepim/komposer/core/tests/managertest.h2
-rw-r--r--libtdepim/komposer/core/tests/testmanager.cpp8
-rw-r--r--libtdepim/komposer/core/tests/testmanager.h2
17 files changed, 46 insertions, 58 deletions
diff --git a/libtdepim/komposer/core/attachment.cpp b/libtdepim/komposer/core/attachment.cpp
index df803de6..6d5017e9 100644
--- a/libtdepim/komposer/core/attachment.cpp
+++ b/libtdepim/komposer/core/attachment.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* attachment.cpp
*
diff --git a/libtdepim/komposer/core/attachment.h b/libtdepim/komposer/core/attachment.h
index 5c4e1ebf..8344c8d7 100644
--- a/libtdepim/komposer/core/attachment.h
+++ b/libtdepim/komposer/core/attachment.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* attachment.h
*
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index fa8e1dc1..1a6d9c1c 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* core.cpp
*
@@ -35,7 +34,7 @@
#include <kstdaction.h>
#include <tdelistbox.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeshortcut.h>
#include <tdelocale.h>
#include <kstatusbar.h>
@@ -226,10 +225,10 @@ void
Core::initCore()
{
m_pluginManager = new PluginManager( this );
- connect( m_pluginManager, TQT_SIGNAL(pluginLoaded(Plugin*)),
- TQT_SLOT(slotPluginLoaded(Plugin*)) );
- connect( m_pluginManager, TQT_SIGNAL(allPluginsLoaded()),
- TQT_SLOT(slotAllPluginsLoaded()) );
+ connect( m_pluginManager, TQ_SIGNAL(pluginLoaded(Plugin*)),
+ TQ_SLOT(slotPluginLoaded(Plugin*)) );
+ connect( m_pluginManager, TQ_SIGNAL(allPluginsLoaded()),
+ TQ_SLOT(slotAllPluginsLoaded()) );
m_pluginManager->loadAllPlugins();
@@ -239,39 +238,39 @@ Core::initCore()
void
Core::initConnections()
{
- connect( kapp, TQT_SIGNAL(shutDown()),
- TQT_SLOT(slotQuit()) );
+ connect( tdeApp, TQ_SIGNAL(shutDown()),
+ TQ_SLOT(slotQuit()) );
}
void
Core::createActions()
{
- KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() );
+ KStdAction::close( this, TQ_SLOT(slotClose()), actionCollection() );
(void) new TDEAction( i18n( "&Send" ), "mail-send", CTRL+Key_Return,
- this, TQT_SLOT(slotSendNow()), actionCollection(),
+ this, TQ_SLOT(slotSendNow()), actionCollection(),
"send_default" );
(void) new TDEAction( i18n( "&Queue" ), "queue", 0,
- this, TQT_SLOT(slotSendLater()),
+ this, TQ_SLOT(slotSendLater()),
actionCollection(), "send_alternative" );
(void) new TDEAction( i18n( "Save in &Drafts Folder" ), "document-save", 0,
- this, TQT_SLOT(slotSaveDraft()),
+ this, TQ_SLOT(slotSaveDraft()),
actionCollection(), "save_in_drafts" );
(void) new TDEAction( i18n( "&Insert File..." ), "document-open", 0,
- this, TQT_SLOT(slotInsertFile()),
+ this, TQ_SLOT(slotInsertFile()),
actionCollection(), "insert_file" );
(void) new TDEAction( i18n( "&Address Book" ), "contents",0,
- this, TQT_SLOT(slotAddrBook()),
+ this, TQ_SLOT(slotAddrBook()),
actionCollection(), "addressbook" );
(void) new TDEAction( i18n( "&New Composer" ), "mail-message-new",
TDEStdAccel::shortcut( TDEStdAccel::New ),
- this, TQT_SLOT(slotNewComposer()),
+ this, TQ_SLOT(slotNewComposer()),
actionCollection(), "new_composer" );
(void) new TDEAction( i18n( "&Attach File..." ), "attach",
- 0, this, TQT_SLOT(slotAttachFile()),
+ 0, this, TQ_SLOT(slotAttachFile()),
actionCollection(), "attach_file" );
}
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 92235a18..dcf1427f 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* core.h
*
@@ -44,7 +43,7 @@ namespace Komposer
*/
class Core : public TDEMainWindow, virtual public KomposerIface
{
- Q_OBJECT
+ TQ_OBJECT
public:
Core( TQWidget *parentWidget = 0, const char *name = 0 );
diff --git a/libtdepim/komposer/core/corewidget.cpp b/libtdepim/komposer/core/corewidget.cpp
index c6589376..d9130f53 100644
--- a/libtdepim/komposer/core/corewidget.cpp
+++ b/libtdepim/komposer/core/corewidget.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* corewidget.cpp
*
diff --git a/libtdepim/komposer/core/corewidget.h b/libtdepim/komposer/core/corewidget.h
index dbe1d674..c0e93b14 100644
--- a/libtdepim/komposer/core/corewidget.h
+++ b/libtdepim/komposer/core/corewidget.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* corewidget.h
*
@@ -31,7 +30,7 @@ namespace Komposer
class CoreWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
CoreWidget( TQWidget *parent, const char *name=0 );
diff --git a/libtdepim/komposer/core/editor.cpp b/libtdepim/komposer/core/editor.cpp
index 5dada393..83b11b0e 100644
--- a/libtdepim/komposer/core/editor.cpp
+++ b/libtdepim/komposer/core/editor.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* editor.cpp
*
diff --git a/libtdepim/komposer/core/editor.h b/libtdepim/komposer/core/editor.h
index a1845f6f..41667af9 100644
--- a/libtdepim/komposer/core/editor.h
+++ b/libtdepim/komposer/core/editor.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* editor.h
*
@@ -37,7 +36,7 @@ namespace Komposer {
class Editor : public Plugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum TextType {
diff --git a/libtdepim/komposer/core/plugin.cpp b/libtdepim/komposer/core/plugin.cpp
index 41af47cd..133d203d 100644
--- a/libtdepim/komposer/core/plugin.cpp
+++ b/libtdepim/komposer/core/plugin.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* plugin.cpp
*
diff --git a/libtdepim/komposer/core/plugin.h b/libtdepim/komposer/core/plugin.h
index c14bcc6b..a462fd90 100644
--- a/libtdepim/komposer/core/plugin.h
+++ b/libtdepim/komposer/core/plugin.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* plugin.h
*
@@ -32,7 +31,7 @@ namespace Komposer
class Plugin : public TQObject,
virtual public KXMLGUIClient
{
- Q_OBJECT
+ TQ_OBJECT
public:
virtual ~Plugin();
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 2e5aa4f6..577baf15 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 2; -*-
/**
* pluginmanager.cpp
* Most of this code has been lifted from Martijn's KopetePluginManager class
@@ -35,8 +34,8 @@
#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
#include <ksettings/dispatcher.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
#include <kstaticdeleter.h>
#include <kurl.h>
@@ -75,11 +74,11 @@ PluginManager::PluginManager( TQObject *parent )
// can remain in control when all windows are removed.
// This way we can unload plugins asynchronously, which is more
// robust if they are still doing processing.
- kapp->ref();
+ tdeApp->ref();
d->shutdownMode = Private::StartingUp;
KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(),
- this, TQT_SLOT( loadAllPlugins() ) );
+ this, TQ_SLOT( loadAllPlugins() ) );
d->plugins = KPluginInfo::fromServices(
TDETrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
@@ -169,7 +168,7 @@ PluginManager::shutdown()
}
}
- TQTimer::singleShot( 3000, this, TQT_SLOT(slotShutdownTimeout()) );
+ TQTimer::singleShot( 3000, this, TQ_SLOT(slotShutdownTimeout()) );
}
void
@@ -217,7 +216,7 @@ PluginManager::slotShutdownDone()
{
d->shutdownMode = Private::DoneShutdown;
- kapp->deref();
+ tdeApp->deref();
}
void
@@ -257,7 +256,7 @@ PluginManager::loadAllPlugins()
}
// Schedule the plugins to load
- TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
}
void PluginManager::slotLoadNextPlugin()
@@ -279,7 +278,7 @@ void PluginManager::slotLoadNextPlugin()
// allPluginsLoaded() signal's handling. This has the added benefit that
// the signal is delayed one event loop, so the accounts are more likely
// to be instantiated.
- TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
}
Plugin*
@@ -290,7 +289,7 @@ PluginManager::loadPlugin( const TQString &pluginId,
return loadPluginInternal( pluginId );
} else {
d->pluginsToLoad.push( pluginId );
- TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) );
+ TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) );
return 0;
}
}
@@ -318,10 +317,10 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
d->loadedPlugins.insert( info, plugin );
info->setPluginEnabled( true );
- connect( plugin, TQT_SIGNAL(destroyed(TQObject*)),
- this, TQT_SLOT(slotPluginDestroyed(TQObject*)) );
- connect( plugin, TQT_SIGNAL(readyForUnload()),
- this, TQT_SLOT(slotPluginReadyForUnload()) );
+ connect( plugin, TQ_SIGNAL(destroyed(TQObject*)),
+ this, TQ_SLOT(slotPluginDestroyed(TQObject*)) );
+ connect( plugin, TQ_SIGNAL(readyForUnload()),
+ this, TQ_SLOT(slotPluginReadyForUnload()) );
kdDebug() << k_funcinfo << "Successfully loaded plugin '"
<< pluginId << "'" << endl;
@@ -397,7 +396,7 @@ PluginManager::slotPluginDestroyed( TQObject *plugin )
{
// Use a timer to make sure any pending deleteLater() calls have
// been handled first
- TQTimer::singleShot( 0, this, TQT_SLOT(slotShutdownDone()) );
+ TQTimer::singleShot( 0, this, TQ_SLOT(slotShutdownDone()) );
}
}
diff --git a/libtdepim/komposer/core/pluginmanager.h b/libtdepim/komposer/core/pluginmanager.h
index eae6d49a..b4a16f8e 100644
--- a/libtdepim/komposer/core/pluginmanager.h
+++ b/libtdepim/komposer/core/pluginmanager.h
@@ -1,4 +1,3 @@
-// -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
/**
* pluginmanager.h
*
@@ -39,7 +38,7 @@ namespace Komposer
class PluginManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 3070b165..c58f2b49 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -31,11 +31,11 @@
#include <tqlabel.h>
#include <tqbuttongroup.h>
-#include <tdepimmacros.h>
+#include <tdemacros.h>
extern "C"
{
- KDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) {
+ TDE_EXPORT TDECModule *create_komposerconfig( TQWidget *parent, const char * ) {
return new Komposer::PrefsModule( parent, "komposerprefs" );
}
}
@@ -81,8 +81,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference,
m_editorsCombo = new KComboBox( m_box );
boxLayout->addWidget( m_editorsCombo );
- connect( m_editorsCombo, TQT_SIGNAL(activated(const TQString&)),
- TQT_SLOT(slotActivated(const TQString&)) );
+ connect( m_editorsCombo, TQ_SIGNAL(activated(const TQString&)),
+ TQ_SLOT(slotActivated(const TQString&)) );
}
EditorSelection::~EditorSelection()
diff --git a/libtdepim/komposer/core/prefsmodule.h b/libtdepim/komposer/core/prefsmodule.h
index a7733019..5be0ec34 100644
--- a/libtdepim/komposer/core/prefsmodule.h
+++ b/libtdepim/komposer/core/prefsmodule.h
@@ -34,7 +34,7 @@ namespace Komposer {
class PrefsModule : public KPrefsModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
PrefsModule( TQWidget *parent=0, const char *name=0 );
@@ -43,7 +43,7 @@ namespace Komposer {
class EditorSelection : public KPrefsWid
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/libtdepim/komposer/core/tests/managertest.h b/libtdepim/komposer/core/tests/managertest.h
index d131f830..76de80d2 100644
--- a/libtdepim/komposer/core/tests/managertest.h
+++ b/libtdepim/komposer/core/tests/managertest.h
@@ -31,7 +31,7 @@ namespace Komposer {
class ManagerTest : public TQObject,
public Tester
{
- Q_OBJECT
+ TQ_OBJECT
public:
ManagerTest( TQObject* parent = 0 );
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index a690c67c..40fe5181 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -15,10 +15,10 @@ TestManager::TestManager( TQObject *parent )
: TQObject( parent )
{
m_manager = new PluginManager( this );
- connect( m_manager, TQT_SIGNAL(pluginLoaded(Plugin*)),
- TQT_SLOT(slotPluginLoaded(Plugin*)) );
- connect( m_manager, TQT_SIGNAL(allPluginsLoaded()),
- TQT_SLOT(slotAllPluginsLoaded()) );
+ connect( m_manager, TQ_SIGNAL(pluginLoaded(Plugin*)),
+ TQ_SLOT(slotPluginLoaded(Plugin*)) );
+ connect( m_manager, TQ_SIGNAL(allPluginsLoaded()),
+ TQ_SLOT(slotAllPluginsLoaded()) );
m_manager->loadAllPlugins();
TQValueList<KPluginInfo*> plugins = m_manager->availablePlugins();
diff --git a/libtdepim/komposer/core/tests/testmanager.h b/libtdepim/komposer/core/tests/testmanager.h
index 67c04414..73b0471b 100644
--- a/libtdepim/komposer/core/tests/testmanager.h
+++ b/libtdepim/komposer/core/tests/testmanager.h
@@ -11,7 +11,7 @@ using Komposer::Plugin;
class TestManager : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TestManager( TQObject *parent );
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 10:33:21 +0000