summaryrefslogtreecommitdiffstats
path: root/tqt3integration
diff options
context:
space:
mode:
Diffstat (limited to 'tqt3integration')
-rw-r--r--tqt3integration/libtqttde/tqttde.cpp2
-rw-r--r--tqt3integration/libtqttde/tqttde.h2
-rw-r--r--tqt3integration/module/module.cpp16
-rw-r--r--tqt3integration/module/module.h12
-rw-r--r--tqt3integration/utils/CMakeLists.txt4
5 files changed, 18 insertions, 18 deletions
diff --git a/tqt3integration/libtqttde/tqttde.cpp b/tqt3integration/libtqttde/tqttde.cpp
index 3647db8a2..45b0a8b96 100644
--- a/tqt3integration/libtqttde/tqttde.cpp
+++ b/tqt3integration/libtqttde/tqttde.cpp
@@ -90,7 +90,7 @@ static DCOPClient* dcopClient()
if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking
{
static tqttde_EventLoop* loop = new tqttde_EventLoop;
- TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool )));
+ TQObject::connect( dcop, TQ_SIGNAL( blockUserInput( bool )), loop, TQ_SLOT( block( bool )));
}
}
return dcop;
diff --git a/tqt3integration/libtqttde/tqttde.h b/tqt3integration/libtqttde/tqttde.h
index 2d634df07..06cba49ed 100644
--- a/tqt3integration/libtqttde/tqttde.h
+++ b/tqt3integration/libtqttde/tqttde.h
@@ -26,7 +26,7 @@
class tqttde_EventLoop
: public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public slots:
void block( bool );
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index e397105b1..cf27233a9 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -38,7 +38,7 @@
extern "C"
{
- KDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj )
+ TDE_EXPORT KDEDModule *create_tdeintegration( const TQCString& obj )
{
return new TDEIntegration::Module( obj );
}
@@ -93,7 +93,7 @@ void* Module::getOpenFileNames( const TQString& filter, TQString workingDirector
dlg->setMode(( multiple ? KFile::Files : KFile::File ) | KFile::LocalOnly );
dlg->setPlainCaption( caption.isNull() ? i18n("Open") : caption );
// TODO dlg->ops->clearHistory();
- connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
dlg->show();
return dlg;
}
@@ -117,7 +117,7 @@ void* Module::getSaveFileName( const TQString& initialSelection, const TQString&
prepareDialog( dlg, parent, wmclass1, wmclass2 );
dlg->setOperationMode( KFileDialog::Saving );
dlg->setPlainCaption( caption.isNull() ? i18n("Save As") : caption );
- connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
dlg->show();
return dlg;
}
@@ -130,7 +130,7 @@ void* Module::getExistingDirectory( const TQString& initialDirectory, long paren
name.isEmpty() ? name : "kdirselect dialog", false );
prepareDialog( dlg, parent, wmclass1, wmclass2 );
dlg->setPlainCaption( caption.isNull() ? i18n( "Select Folder" ) : caption );
- connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
dlg->show();
return dlg;
}
@@ -144,7 +144,7 @@ void* Module::getColor( const TQColor& color, long parent, const TQCString& name
dlg->setColor( color );
prepareDialog( dlg, parent, wmclass1, wmclass2 );
dlg->setPlainCaption( i18n( "Select Color" ));
- connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
dlg->show();
return dlg;
}
@@ -156,7 +156,7 @@ void* Module::getFont( bool /*ok*/, const TQFont& def, long parent, const TQCStr
dlg->setFont( def, false );
prepareDialog( dlg, parent, wmclass1, wmclass2 );
dlg->setPlainCaption( i18n( "Select Font" ));
- connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
dlg->show();
return dlg;
}
@@ -245,7 +245,7 @@ void* Module::messageBox1( int type, long parent, const TQString& caption, const
&checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
prepareDialog( dialog, parent, wmclass1, wmclass2 );
dialog->setPlainCaption( caption );
- connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
btns b;
b.buttons[ 0 ] = buttons[ 0 ];
b.buttons[ 1 ] = buttons[ 1 ];
@@ -277,7 +277,7 @@ void* Module::messageBox2( int type, long parent, const TQString& caption, const
&checkboxResult, KMessageBox::Notify | KMessageBox::NoExec);
prepareDialog( dialog, parent, wmclass1, wmclass2 );
dialog->setPlainCaption( caption );
- connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int )));
+ connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int )));
dialog->show();
return dialog;
}
diff --git a/tqt3integration/module/module.h b/tqt3integration/module/module.h
index cf136aa8c..f32ef85e2 100644
--- a/tqt3integration/module/module.h
+++ b/tqt3integration/module/module.h
@@ -36,7 +36,7 @@ namespace TDEIntegration
class Module
: public KDEDModule
{
- Q_OBJECT
+ TQ_OBJECT
public:
Module( const TQCString& obj );
@@ -69,7 +69,7 @@ class Module
class KFileDialog
: public ::KFileDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
KFileDialog(const TQString& startDir, const TQString& filter,
@@ -86,7 +86,7 @@ class KFileDialog
class KDirSelectDialog
: public ::KDirSelectDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDirSelectDialog(const TQString& startDir, bool localOnly,
@@ -103,7 +103,7 @@ class KDirSelectDialog
class KColorDialog
: public ::KColorDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
KColorDialog( TQWidget *parent, const char *name, bool modal )
@@ -118,7 +118,7 @@ class KColorDialog
class TDEFontDialog
: public ::TDEFontDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEFontDialog( TQWidget *parent, const char *name, bool onlyFixed, bool modal,
@@ -135,7 +135,7 @@ class TDEFontDialog
class KDialogBase
: public ::KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDialogBase( const TQString &caption, int buttonMask=Yes|No|Cancel,
diff --git a/tqt3integration/utils/CMakeLists.txt b/tqt3integration/utils/CMakeLists.txt
index c75567af5..a65b3108e 100644
--- a/tqt3integration/utils/CMakeLists.txt
+++ b/tqt3integration/utils/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_executable( gen AUTOMOC
LINK tdecore-shared
)
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
${CMAKE_CURRENT_BINARY_DIR}/module_functions.cpp
@@ -44,6 +44,6 @@ ADD_CUSTOM_COMMAND(
DEPENDS gen
)
-ADD_CUSTOM_TARGET( generate_tqt3_bindings
+add_custom_target( generate_tqt3_bindings
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tqttde_functions.cpp
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 01:07:18 +0000