summaryrefslogtreecommitdiffstats
path: root/xparts
diff options
context:
space:
mode:
Diffstat (limited to 'xparts')
-rw-r--r--xparts/mozilla/kmozillapart.cpp8
-rw-r--r--xparts/mozilla/kmozillapart.h2
-rw-r--r--xparts/mozilla/kshell.cpp12
-rw-r--r--xparts/src/gtk/Makefile.am2
-rw-r--r--xparts/src/tde/kbrowsersignals.h2
-rw-r--r--xparts/src/tde/xparthost_kpart.cpp6
-rw-r--r--xparts/src/tde/xparthost_kpart.h2
-rw-r--r--xparts/xpart_notepad/Makefile.am2
-rw-r--r--xparts/xpart_notepad/shell_xparthost.cpp14
-rw-r--r--xparts/xpart_notepad/shell_xparthost.h2
-rw-r--r--xparts/xpart_notepad/xp_notepad.cpp2
-rw-r--r--xparts/xpart_notepad/xp_notepad_factory.cpp8
-rw-r--r--xparts/xpart_notepad/xp_notepad_factory.h4
13 files changed, 33 insertions, 33 deletions
diff --git a/xparts/mozilla/kmozillapart.cpp b/xparts/mozilla/kmozillapart.cpp
index d59c7e2c..3bea5587 100644
--- a/xparts/mozilla/kmozillapart.cpp
+++ b/xparts/mozilla/kmozillapart.cpp
@@ -6,7 +6,7 @@
#include <kstdaction.h>
#include <tdeaction.h>
#include <tdemainwindow.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
#include <tdeaboutdata.h>
@@ -23,11 +23,11 @@ KMozillaPart::KMozillaPart(TQWidget *parentWidget, const char *widgetName,
m_partProcess = new TDEProcess;
*m_partProcess << "kmozilla"
- << kapp->dcopClient()->appId() << objId();
+ << tdeApp->dcopClient()->appId() << objId();
m_partProcess->start();
tqDebug("---->>>>>> enter loop");
- kapp->enter_loop();
+ tdeApp->enter_loop();
tqDebug("----<<<<<< left loop");
}
@@ -40,7 +40,7 @@ void KMozillaPart::createActions( const TQCString &xmlActions )
{
XPartHost_KPart::createActions( xmlActions );
tqDebug("----<<<<<< exit loop");
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
TDEAboutData *KMozillaPart::createAboutData()
diff --git a/xparts/mozilla/kmozillapart.h b/xparts/mozilla/kmozillapart.h
index 00589d14..b53f4d16 100644
--- a/xparts/mozilla/kmozillapart.h
+++ b/xparts/mozilla/kmozillapart.h
@@ -8,7 +8,7 @@ class TDEProcess;
class KMozillaPart : public XPartHost_KPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMozillaPart(TQWidget *parentWidget, const char *widgetName,
diff --git a/xparts/mozilla/kshell.cpp b/xparts/mozilla/kshell.cpp
index 2b916dd5..33825526 100644
--- a/xparts/mozilla/kshell.cpp
+++ b/xparts/mozilla/kshell.cpp
@@ -7,13 +7,13 @@
#include <kstdaction.h>
#include <tdeaction.h>
#include <tdemainwindow.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
class ShellWindow : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
ShellWindow()
@@ -22,19 +22,19 @@ public:
setCentralWidget( m_host->widget() );
- connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) );
+ connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) );
#if 1
m_partProcess = new TDEProcess;
*m_partProcess << "./kmozilla"
- << kapp->dcopClient()->appId() << m_host->objId();
+ << tdeApp->dcopClient()->appId() << m_host->objId();
m_partProcess->start();
#endif
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0,
actionCollection(), "location" );
- connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) );
+ connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) );
s->setEditable(true);
}
virtual ~ShellWindow()
diff --git a/xparts/src/gtk/Makefile.am b/xparts/src/gtk/Makefile.am
index 839e43db..1acb72f4 100644
--- a/xparts/src/gtk/Makefile.am
+++ b/xparts/src/gtk/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libgtkxparts.la
libgtkxparts_la_SOURCES = gtkpart.c gtkbrowserextension.c
libgtkxparts_la_LIBADD = $(GTK2_LIBS) $(GLIB2_LIBS) $(top_builddir)/dcopc/libdcopc.la
-libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined
+libgtkxparts_la_LDFLAGS = $(all_libraries) -no-undefined
gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h
gtkxpartsincludedir = $(includedir)/xtdeparts
diff --git a/xparts/src/tde/kbrowsersignals.h b/xparts/src/tde/kbrowsersignals.h
index baee95aa..4fad567e 100644
--- a/xparts/src/tde/kbrowsersignals.h
+++ b/xparts/src/tde/kbrowsersignals.h
@@ -10,7 +10,7 @@ class XPartHost_KPart;
class KBrowserSignals : public KParts::BrowserExtension, virtual public XBrowserSignals
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBrowserSignals( XPartHost_KPart *part, DCOPRef ref );
virtual ~KBrowserSignals();
diff --git a/xparts/src/tde/xparthost_kpart.cpp b/xparts/src/tde/xparthost_kpart.cpp
index 54bcb804..56049523 100644
--- a/xparts/src/tde/xparthost_kpart.cpp
+++ b/xparts/src/tde/xparthost_kpart.cpp
@@ -53,7 +53,7 @@ DCOPRef XPartHost_KPart::registerXPart( const DCOPRef &part )
tqDebug(" found browser extension ");
be = new KBrowserSignals( this, ref );
}
- return DCOPRef( kapp->dcopClient()->appId(), objId() );
+ return DCOPRef( tdeApp->dcopClient()->appId(), objId() );
}
@@ -77,9 +77,9 @@ void XPartHost_KPart::createActions( const TQCString &xmlActions )
TQString type = e.attribute("type");
if(type.isEmpty())
- new TDEAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() );
+ new TDEAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() );
else if( type == "toggle" )
- new TDEToggleAction( name, 0, this, TQT_SLOT( actionActivated() ), actionCollection(), name.latin1() );
+ new TDEToggleAction( name, 0, this, TQ_SLOT( actionActivated() ), actionCollection(), name.latin1() );
kdDebug() << "action=" << name << " type=" << type << endl;
} else if ( e.tagName() == "XMLFile" ) {
TQString location = e.attribute("location");
diff --git a/xparts/src/tde/xparthost_kpart.h b/xparts/src/tde/xparthost_kpart.h
index 8cc54699..a8e74d1e 100644
--- a/xparts/src/tde/xparthost_kpart.h
+++ b/xparts/src/tde/xparthost_kpart.h
@@ -19,7 +19,7 @@ class QXEmbed;
*/
class XPartHost_KPart : public KParts::ReadOnlyPart, public XPartHost
{
- Q_OBJECT
+ TQ_OBJECT
public:
XPartHost_KPart( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name );
diff --git a/xparts/xpart_notepad/Makefile.am b/xparts/xpart_notepad/Makefile.am
index 5916508b..f09ec92a 100644
--- a/xparts/xpart_notepad/Makefile.am
+++ b/xparts/xpart_notepad/Makefile.am
@@ -10,7 +10,7 @@ xparthost_DIR=$(srcdir)/../src/interfaces
xp_notepad_SOURCES = xp_notepad.cpp xpart.skel xparthost.stub
xp_notepad_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP ../src/tde/libtdexparts.la
#xp_notepad_LDFLAGS = -L$(prefix)/lib -lxpcom $(all_libraries)
-xp_notepad_LDFLAGS = -L$(prefix)/lib $(all_libraries)
+xp_notepad_LDFLAGS = $(all_libraries)
shell_xparthost_SOURCES = shell_xparthost.cpp
shell_xparthost_LDADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) $(top_builddir)/xparts/src/tde/libtdexparts.la
diff --git a/xparts/xpart_notepad/shell_xparthost.cpp b/xparts/xpart_notepad/shell_xparthost.cpp
index 666c16a6..c5eb937b 100644
--- a/xparts/xpart_notepad/shell_xparthost.cpp
+++ b/xparts/xpart_notepad/shell_xparthost.cpp
@@ -8,7 +8,7 @@
#include <kstdaction.h>
#include <tdeaction.h>
#include <tdemainwindow.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
@@ -19,20 +19,20 @@ ShellWindow::ShellWindow()
setCentralWidget( m_host->widget() );
- connect(m_host, TQT_SIGNAL( actionsInitialized() ), this, TQT_SLOT( mergeGUI() ) );
+ connect(m_host, TQ_SIGNAL( actionsInitialized() ), this, TQ_SLOT( mergeGUI() ) );
// Launch our XPart child.
m_partProcess = new TDEProcess;
*m_partProcess << "./xp_notepad"
- << kapp->dcopClient()->appId() << m_host->objId();
+ << tdeApp->dcopClient()->appId() << m_host->objId();
m_partProcess->start();
// Init our Gui
- (void) new TDEAction( "Hop", 0, this, TQT_SLOT(hop()), actionCollection(), "hop" );
- KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
+ (void) new TDEAction( "Hop", 0, this, TQ_SLOT(hop()), actionCollection(), "hop" );
+ KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() );
TDESelectAction *s = new TDESelectAction( "http://www.kde.org" , 0,
actionCollection(), "location" );
- connect( s, TQT_SIGNAL(activated( const TQString& ) ), this, TQT_SLOT( slotOpenUrl( const TQString & ) ) );
+ connect( s, TQ_SIGNAL(activated( const TQString& ) ), this, TQ_SLOT( slotOpenUrl( const TQString & ) ) );
s->setEditable(true);
kdDebug() << "KShell window created" << endl;
@@ -66,7 +66,7 @@ void ShellWindow::mergeGUI()
int main( int argc, char **argv )
{
- TDEApplication app( argc, argv, "xparthost_shell" );
+ TDEApplication app( argc, argv, TQCString("xparthost_shell") );
app.dcopClient()->registerAs("xparthost_shell");
diff --git a/xparts/xpart_notepad/shell_xparthost.h b/xparts/xpart_notepad/shell_xparthost.h
index 4e329822..e11e52f7 100644
--- a/xparts/xpart_notepad/shell_xparthost.h
+++ b/xparts/xpart_notepad/shell_xparthost.h
@@ -9,7 +9,7 @@ class TDEProcess;
class ShellWindow : public KParts::MainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
ShellWindow();
diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp
index 48c184e8..b5cfa5e8 100644
--- a/xparts/xpart_notepad/xp_notepad.cpp
+++ b/xparts/xpart_notepad/xp_notepad.cpp
@@ -80,7 +80,7 @@ int main( int argc, char **argv )
}
printf("args: XPartHost appId = %s , XPartHost_KPart objId = %s\n", argv[1], argv[2] );
- TDEApplication app( argc, argv, "xp_notepad" );
+ TDEApplication app( argc, argv, TQCString("xp_notepad") );
XPartNotepad * xpn = new XPartNotepad("xp_notepad");
app.setMainWidget( xpn );
app.dcopClient()->attach();
diff --git a/xparts/xpart_notepad/xp_notepad_factory.cpp b/xparts/xpart_notepad/xp_notepad_factory.cpp
index cfb2019b..9e4c88a5 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.cpp
+++ b/xparts/xpart_notepad/xp_notepad_factory.cpp
@@ -24,7 +24,7 @@
#include <kstdaction.h>
#include <tdeaction.h>
#include <tdemainwindow.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdeparts/mainwindow.h>
#include <kdebug.h>
#include "xp_notepad_factory.h"
@@ -49,11 +49,11 @@ XP_NotepadPart::XP_NotepadPart(TQWidget *parentWidget, const char *widgetName,
{
m_partProcess = new TDEProcess;
*m_partProcess << "xnotepard"
- << kapp->dcopClient()->appId() << objId();
+ << tdeApp->dcopClient()->appId() << objId();
m_partProcess->start();
tqDebug("---->>>>>> enter loop");
- kapp->enter_loop();
+ tdeApp->enter_loop();
tqDebug("----<<<<<< left loop");
}
@@ -66,7 +66,7 @@ void XP_NotepadPart::createActions( const TQCString &xmlActions )
{
XPartHost_KPart::createActions( xmlActions );
tqDebug("----<<<<<< exit loop");
- kapp->exit_loop();
+ tdeApp->exit_loop();
}
#include "xp_notepad_factory.moc"
diff --git a/xparts/xpart_notepad/xp_notepad_factory.h b/xparts/xpart_notepad/xp_notepad_factory.h
index 02d36cfc..2a4fe069 100644
--- a/xparts/xpart_notepad/xp_notepad_factory.h
+++ b/xparts/xpart_notepad/xp_notepad_factory.h
@@ -34,7 +34,7 @@ class TDEProcess;
class XP_NotepadFactory : public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
XP_NotepadFactory( bool clone = false ) {}
virtual ~XP_NotepadFactory() {}
@@ -47,7 +47,7 @@ public:
class XP_NotepadPart : public XPartHost_KPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
XP_NotepadPart(TQWidget *parentWidget, const char *widgetName,
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 11:52:14 +0000