summaryrefslogtreecommitdiffstats
path: root/tdeioslave/man
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/man')
-rw-r--r--tdeioslave/man/kmanpart.cpp4
-rw-r--r--tdeioslave/man/kmanpart.h4
-rw-r--r--tdeioslave/man/man2html.cpp8
-rw-r--r--tdeioslave/man/tdeio_man.cpp13
-rw-r--r--tdeioslave/man/tdeio_man.h2
-rw-r--r--tdeioslave/man/tdeio_man_test.cpp2
6 files changed, 17 insertions, 16 deletions
diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index 556b287e4..703ec2202 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -95,8 +95,8 @@ bool KManPart::openFile()
url.setPath( m_file );
m_job = TDEIO::get( url, true, false );
- connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
- connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) );
+ connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) );
+ connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) );
return true;
}
diff --git a/tdeioslave/man/kmanpart.h b/tdeioslave/man/kmanpart.h
index 908cca538..4fdb45733 100644
--- a/tdeioslave/man/kmanpart.h
+++ b/tdeioslave/man/kmanpart.h
@@ -39,7 +39,7 @@ class TDEAboutData;
*/
class KManPartFactory: public KParts::Factory
{
- Q_OBJECT
+ TQ_OBJECT
public:
KManPartFactory( TQObject * parent = 0, const char * name = 0 );
virtual ~KManPartFactory();
@@ -58,7 +58,7 @@ class KManPartFactory: public KParts::Factory
class KManPart : public TDEHTMLPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
KManPart( TQWidget * parent, const char * name = 0L );
KParts::BrowserExtension * extension() {return m_extension;}
diff --git a/tdeioslave/man/man2html.cpp b/tdeioslave/man/man2html.cpp
index a8c5751c0..3f27feb68 100644
--- a/tdeioslave/man/man2html.cpp
+++ b/tdeioslave/man/man2html.cpp
@@ -330,7 +330,7 @@ static void InitNumberDefinitions( void )
{
// As the date number registers are more for end-users, better choose local time.
// Groff seems to support Gregorian dates only
- TQDate today( TQDate::currentDate( Qt::LocalTime ) );
+ TQDate today( TQDate::currentDate( TQt::LocalTime ) );
s_numberDefinitionMap.insert( "year", today.year() ); // Y2K-correct year
s_numberDefinitionMap.insert( "yr", today.year() - 1900 ); // Y2K-incorrect year
s_numberDefinitionMap.insert( "mo", today.month() );
@@ -4190,13 +4190,13 @@ static char *scan_request(char *c)
if (mode)
{
// .rm ReMove
- s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+ s_stringDefinitionMap.remove(name);
}
else
{
// .rn ReName
StringDefinition def=(*it);
- s_stringDefinitionMap.remove(name); // ### QT4: removeAll
+ s_stringDefinitionMap.remove(name);
s_stringDefinitionMap.insert(name2,def);
}
}
@@ -5152,7 +5152,7 @@ static char *scan_request(char *c)
else
{
NumberDefinition def=(*it);
- s_numberDefinitionMap.remove(name); // ### QT4: removeAll
+ s_numberDefinitionMap.remove(name);
s_numberDefinitionMap.insert(name2,def);
}
kdDebug(7107) << "end .rnn" << endl;
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 92530facb..cd04f702e 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -204,8 +204,8 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString &section)
TDEProcess proc;
proc << "whatis" << "-M" << (*it_dir) << "-w" << "*";
myStdStream = TQString::null;
- connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
- TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
+ connect( &proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ),
+ TQ_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) );
proc.start( TDEProcess::Block, TDEProcess::Stdout );
TQTextStream t( &myStdStream, IO_ReadOnly );
parseWhatIs( i, t, mark );
@@ -555,8 +555,8 @@ char *MANProtocol::readManPage(const char *_filename)
getProgramPath();
proc << mySgml2RoffPath << filename;
- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
+ TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+ this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int)));
proc.start(TDEProcess::Block, TDEProcess::All);
const TQCString cstr=myStdStream.latin1();
@@ -589,8 +589,8 @@ char *MANProtocol::readManPage(const char *_filename)
proc << "man" << "--recode" << "UTF-8" << filename;
- TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
- this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
+ TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)),
+ this, TQ_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int)));
proc.start(TDEProcess::Block, TDEProcess::All);
const TQCString cstr=myStdStream.utf8();
@@ -963,6 +963,7 @@ void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_c
"/usr/sunpc/man",
"/usr/ncd/man",
"/usr/newsprint/man",
+ TDE_MANDIR,
NULL };
diff --git a/tdeioslave/man/tdeio_man.h b/tdeioslave/man/tdeio_man.h
index e621a7fbf..89c1d29c4 100644
--- a/tdeioslave/man/tdeio_man.h
+++ b/tdeioslave/man/tdeio_man.h
@@ -34,7 +34,7 @@
class MANProtocol : public TQObject, public TDEIO::SlaveBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp
index 131e03541..898a18eaa 100644
--- a/tdeioslave/man/tdeio_man_test.cpp
+++ b/tdeioslave/man/tdeio_man_test.cpp
@@ -11,7 +11,7 @@
class tdeio_man_test : public MANProtocol
{
- Q_OBJECT
+ TQ_OBJECT
public:
tdeio_man_test(const TQCString &pool_socket, const TQCString &app_socket);