TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Update various qt function definitions and static methods for tqt3

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 77041d785d
commit 989d6a1901
27 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File

2
kcontrol/background/bgdialog.cpp
Unescape View File

@ -256,7 +256,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
initUI(); initUI();
updateUI(); updateUI();
#if (QT_VERSION-0 >= 0x030200) #if (TQT_VERSION-0 >= 0x030200)
connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
#endif #endif
} }

2
kcontrol/randr/krandrtray.cpp
Unescape View File

@ -70,7 +70,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
#if (QT_VERSION-0 >= 0x030200) // XRANDR support #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
// connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized())); // connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized()));
#endif #endif

2
kdesktop/bgmanager.cc
Unescape View File

@ -116,7 +116,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule
TQT_SLOT(slotChangeViewport(int, const TQPoint&))); TQT_SLOT(slotChangeViewport(int, const TQPoint&)));
#if (QT_VERSION-0 >= 0x030200) #if (TQT_VERSION-0 >= 0x030200)
connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
#endif #endif

2
kdesktop/bgmanager.h
Unescape View File

@ -15,7 +15,7 @@
#include <KBackgroundIface.h> #include <KBackgroundIface.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

4
kdesktop/desktop.cc
Unescape View File

@ -202,7 +202,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
TQTimer::singleShot(0, this, TQT_SLOT( slotStart() )); TQTimer::singleShot(0, this, TQT_SLOT( slotStart() ));
#if (QT_VERSION-0 >= 0x030200) // XRANDR support #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif #endif
} }
@ -547,7 +547,7 @@ void KDesktop::slotShowTaskManager()
{ {
//kdDebug(1204) << "Launching KSysGuard..." << endl; //kdDebug(1204) << "Launching KSysGuard..." << endl;
KProcess* p = new KProcess; KProcess* p = new KProcess;
Q_CHECK_PTR(p); TQ_CHECK_PTR(p);
*p << "ksysguard"; *p << "ksysguard";
*p << "--showprocesses"; *p << "--showprocesses";

2
kdesktop/kdesktopapp.h
Unescape View File

@ -23,7 +23,7 @@
#include <config.h> #include <config.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

2
kdesktop/krootwm.cc
Unescape View File

@ -755,7 +755,7 @@ void KRootWm::slotOpenTerminal()
{ {
// kdDebug() << "KRootWm::slotOpenTerminal" << endl; // kdDebug() << "KRootWm::slotOpenTerminal" << endl;
KProcess* p = new KProcess; KProcess* p = new KProcess;
Q_CHECK_PTR(p); TQ_CHECK_PTR(p);
KConfigGroupSaver gs(KGlobal::config(), "General"); KConfigGroupSaver gs(KGlobal::config(), "General");
TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");

2
kdesktop/lock/lockprocess.cc
Unescape View File

@ -281,7 +281,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
} }
#endif #endif
#if (QT_VERSION-0 >= 0x030200) // XRANDR support #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif #endif

2
kdesktop/main.cc
Unescape View File

@ -43,7 +43,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

2
kdesktop/startupid.cpp
Unescape View File

@ -159,7 +159,7 @@ void StartupId::stop_startupid()
static TQPixmap scalePixmap( const TQPixmap& pm, int w, int h ) static TQPixmap scalePixmap( const TQPixmap& pm, int w, int h )
{ {
#if QT_VERSION >= 0x030200 #if TQT_VERSION >= 0x030200
TQPixmap result( 20, 20, pm.depth() ); TQPixmap result( 20, 20, pm.depth() );
result.setMask( TQBitmap( 20, 20, true ) ); result.setMask( TQBitmap( 20, 20, true ) );
TQPixmap scaled( pm.convertToImage().smoothScale( w, h ) ); TQPixmap scaled( pm.convertToImage().smoothScale( w, h ) );

2
kicker/kicker/core/kicker.cpp
Unescape View File

@ -128,7 +128,7 @@ Kicker::Kicker()
connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); connect(this, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged()));
connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); connect(this, TQT_SIGNAL(kdisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
#if (QT_VERSION-0 >= 0x030200) // XRANDR support #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized()));
#endif #endif

2
konqueror/konq_mainwindow.cc
Unescape View File

@ -3649,7 +3649,7 @@ void KonqMainWindow::slotUpdateFullScreen( bool set )
} }
else else
{ {
#if QT_VERSION >= 0x030300 #if TQT_VERSION >= 0x030300
setWindowState( windowState() & ~WindowFullScreen ); setWindowState( windowState() & ~WindowFullScreen );
#else #else
if( isMaximized()) if( isMaximized())

2
konsole/konsole/main.cpp
Unescape View File

@ -46,7 +46,7 @@
#include "konsole.h" #include "konsole.h"
#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300 #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300
#define COMPOSITE #define COMPOSITE
#endif #endif

4
ksysguard/gui/SensorDisplayLib/ListView.cc
Unescape View File

@ -207,7 +207,7 @@ ListView::ListView(TQWidget* parent, const char* name, const TQString& title, in
setBackgroundColor(KSGRD::Style->backgroundColor()); setBackgroundColor(KSGRD::Style->backgroundColor());
monitor = new PrivateListView( frame() ); monitor = new PrivateListView( frame() );
Q_CHECK_PTR(monitor); TQ_CHECK_PTR(monitor);
monitor->setSelectionMode(TQListView::NoSelection); monitor->setSelectionMode(TQListView::NoSelection);
monitor->setItemMargin(2); monitor->setItemMargin(2);
@ -328,7 +328,7 @@ void
ListView::configureSettings() ListView::configureSettings()
{ {
lvs = new ListViewSettings(this, "ListViewSettings"); lvs = new ListViewSettings(this, "ListViewSettings");
Q_CHECK_PTR(lvs); TQ_CHECK_PTR(lvs);
connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
TQColorGroup colorGroup = monitor->colorGroup(); TQColorGroup colorGroup = monitor->colorGroup();

4
ksysguard/gui/SensorDisplayLib/LogFile.cc
Unescape View File

@ -40,7 +40,7 @@ LogFile::LogFile(TQWidget *parent, const char *name, const TQString& title)
: KSGRD::SensorDisplay(parent, name, title) : KSGRD::SensorDisplay(parent, name, title)
{ {
monitor = new TQListBox(this); monitor = new TQListBox(this);
Q_CHECK_PTR(monitor); TQ_CHECK_PTR(monitor);
setMinimumSize(50, 25); setMinimumSize(50, 25);
@ -82,7 +82,7 @@ void LogFile::configureSettings(void)
TQColorGroup cgroup = monitor->colorGroup(); TQColorGroup cgroup = monitor->colorGroup();
lfs = new LogFileSettings(this); lfs = new LogFileSettings(this);
Q_CHECK_PTR(lfs); TQ_CHECK_PTR(lfs);
lfs->fgColor->setColor(cgroup.text()); lfs->fgColor->setColor(cgroup.text());
lfs->fgColor->setText(i18n("Foreground color:")); lfs->fgColor->setText(i18n("Foreground color:"));

4
ksysguard/gui/SensorDisplayLib/MultiMeter.cc
Unescape View File

@ -50,7 +50,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name,
lcd = new TQLCDNumber(this, "meterLCD"); lcd = new TQLCDNumber(this, "meterLCD");
else else
lcd = new TQLCDNumber(frame(), "meterLCD"); lcd = new TQLCDNumber(frame(), "meterLCD");
Q_CHECK_PTR(lcd); TQ_CHECK_PTR(lcd);
lcd->setSegmentStyle(TQLCDNumber::Filled); lcd->setSegmentStyle(TQLCDNumber::Filled);
setDigitColor(KSGRD::Style->backgroundColor()); setDigitColor(KSGRD::Style->backgroundColor());
lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
@ -191,7 +191,7 @@ void
MultiMeter::configureSettings() MultiMeter::configureSettings()
{ {
mms = new MultiMeterSettings(this, "MultiMeterSettings"); mms = new MultiMeterSettings(this, "MultiMeterSettings");
Q_CHECK_PTR(mms); TQ_CHECK_PTR(mms);
mms->setTitle(title()); mms->setTitle(title());
mms->setShowUnit(showUnit()); mms->setShowUnit(showUnit());
mms->setLowerLimitActive(lowerLimitActive); mms->setLowerLimitActive(lowerLimitActive);

16
ksysguard/gui/SensorDisplayLib/ProcessController.cc
Unescape View File

@ -67,16 +67,16 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
// Setup the geometry management. // Setup the geometry management.
gm = new TQVBoxLayout(this, 10); gm = new TQVBoxLayout(this, 10);
Q_CHECK_PTR(gm); TQ_CHECK_PTR(gm);
gm->addSpacing(15); gm->addSpacing(15);
gmSearch = new TQHBoxLayout(); gmSearch = new TQHBoxLayout();
Q_CHECK_PTR(gmSearch); TQ_CHECK_PTR(gmSearch);
gm->addLayout(gmSearch, 0); gm->addLayout(gmSearch, 0);
// Create the table that lists the processes. // Create the table that lists the processes.
pList = new ProcessList(this, "pList"); pList = new ProcessList(this, "pList");
Q_CHECK_PTR(pList); TQ_CHECK_PTR(pList);
pList->setShowSortIndicator(true); pList->setShowSortIndicator(true);
pListSearchLine = new KListViewSearchLineWidget(pList, this, "process_list_search_line"); pListSearchLine = new KListViewSearchLineWidget(pList, this, "process_list_search_line");
gmSearch->addWidget(pListSearchLine, 1); gmSearch->addWidget(pListSearchLine, 1);
@ -92,7 +92,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
* cbFilter must be created prior to constructing pList as the * cbFilter must be created prior to constructing pList as the
* pList constructor sets cbFilter to its start value. */ * pList constructor sets cbFilter to its start value. */
cbFilter = new TQComboBox(this, "pList_cbFilter"); cbFilter = new TQComboBox(this, "pList_cbFilter");
Q_CHECK_PTR(cbFilter); TQ_CHECK_PTR(cbFilter);
gmSearch->addWidget(cbFilter,0); gmSearch->addWidget(cbFilter,0);
cbFilter->insertItem(i18n("All Processes"), 0); cbFilter->insertItem(i18n("All Processes"), 0);
cbFilter->insertItem(i18n("System Processes"), 1); cbFilter->insertItem(i18n("System Processes"), 1);
@ -101,7 +101,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
cbFilter->setMinimumSize(cbFilter->sizeHint()); cbFilter->setMinimumSize(cbFilter->sizeHint());
// Create the check box to switch between tree view and list view. // Create the check box to switch between tree view and list view.
xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView");
Q_CHECK_PTR(xbTreeView); TQ_CHECK_PTR(xbTreeView);
xbTreeView->setMinimumSize(xbTreeView->sizeHint()); xbTreeView->setMinimumSize(xbTreeView->sizeHint());
connect(xbTreeView, TQT_SIGNAL(toggled(bool)), connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setTreeView(bool))); this, TQT_SLOT(setTreeView(bool)));
@ -115,13 +115,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
// Create the 'Refresh' button. // Create the 'Refresh' button.
bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ),
this, "bRefresh" ); this, "bRefresh" );
Q_CHECK_PTR(bRefresh); TQ_CHECK_PTR(bRefresh);
bRefresh->setMinimumSize(bRefresh->sizeHint()); bRefresh->setMinimumSize(bRefresh->sizeHint());
connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
// Create the 'Kill' button. // Create the 'Kill' button.
bKill = new KPushButton(i18n("&Kill"), this, "bKill"); bKill = new KPushButton(i18n("&Kill"), this, "bKill");
Q_CHECK_PTR(bKill); TQ_CHECK_PTR(bKill);
bKill->setMinimumSize(bKill->sizeHint()); bKill->setMinimumSize(bKill->sizeHint());
connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
/* Disable the kill button until we know that the daemon supports the /* Disable the kill button until we know that the daemon supports the
@ -132,7 +132,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
gm->addWidget(pList, 1); gm->addWidget(pList, 1);
gm1 = new TQHBoxLayout(); gm1 = new TQHBoxLayout();
Q_CHECK_PTR(gm1); TQ_CHECK_PTR(gm1);
gm->addLayout(gm1, 0); gm->addLayout(gm1, 0);
gm1->addStretch(); gm1->addStretch();
gm1->addWidget(xbTreeView); gm1->addWidget(xbTreeView);

16
ksysguard/gui/SensorDisplayLib/SensorLogger.cc
Unescape View File

@ -39,12 +39,12 @@ LogSensor::LogSensor(TQListView *parent)
: timerID( NONE ), lowerLimitActive( 0 ), upperLimitActive( 0 ), : timerID( NONE ), lowerLimitActive( 0 ), upperLimitActive( 0 ),
lowerLimit( 0 ), upperLimit( 0 ) lowerLimit( 0 ), upperLimit( 0 )
{ {
Q_CHECK_PTR(parent); TQ_CHECK_PTR(parent);
monitor = parent; monitor = parent;
lvi = new SLListViewItem(monitor); lvi = new SLListViewItem(monitor);
Q_CHECK_PTR(lvi); TQ_CHECK_PTR(lvi);
pixmap_running = UserIcon( "running" ); pixmap_running = UserIcon( "running" );
pixmap_waiting = UserIcon( "waiting" ); pixmap_waiting = UserIcon( "waiting" );
@ -131,7 +131,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t
: KSGRD::SensorDisplay(parent, name, title) : KSGRD::SensorDisplay(parent, name, title)
{ {
monitor = new TQListView(this, "monitor"); monitor = new TQListView(this, "monitor");
Q_CHECK_PTR(monitor); TQ_CHECK_PTR(monitor);
monitor->addColumn(i18n("Logging")); monitor->addColumn(i18n("Logging"));
monitor->addColumn(i18n("Timer Interval")); monitor->addColumn(i18n("Timer Interval"));
@ -169,12 +169,12 @@ SensorLogger::addSensor(const TQString& hostName, const TQString& sensorName, co
return (false); return (false);
sld = new SensorLoggerDlg(this, "SensorLoggerDlg"); sld = new SensorLoggerDlg(this, "SensorLoggerDlg");
Q_CHECK_PTR(sld); TQ_CHECK_PTR(sld);
if (sld->exec()) { if (sld->exec()) {
if (!sld->fileName().isEmpty()) { if (!sld->fileName().isEmpty()) {
LogSensor *sensor = new LogSensor(monitor); LogSensor *sensor = new LogSensor(monitor);
Q_CHECK_PTR(sensor); TQ_CHECK_PTR(sensor);
sensor->setHostName(hostName); sensor->setHostName(hostName);
sensor->setSensorName(sensorName); sensor->setSensorName(sensorName);
@ -201,7 +201,7 @@ bool
SensorLogger::editSensor(LogSensor* sensor) SensorLogger::editSensor(LogSensor* sensor)
{ {
sld = new SensorLoggerDlg(this, "SensorLoggerDlg"); sld = new SensorLoggerDlg(this, "SensorLoggerDlg");
Q_CHECK_PTR(sld); TQ_CHECK_PTR(sld);
sld->setFileName(sensor->getFileName()); sld->setFileName(sensor->getFileName());
sld->setTimerInterval(sensor->getTimerInterval()); sld->setTimerInterval(sensor->getTimerInterval());
@ -235,7 +235,7 @@ SensorLogger::configureSettings()
TQColorGroup cgroup = monitor->colorGroup(); TQColorGroup cgroup = monitor->colorGroup();
sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
Q_CHECK_PTR(sls); TQ_CHECK_PTR(sls);
connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) );
@ -295,7 +295,7 @@ SensorLogger::restoreSettings(TQDomElement& element)
for (uint i = 0; i < dnList.count(); i++) { for (uint i = 0; i < dnList.count(); i++) {
TQDomElement element = dnList.item(i).toElement(); TQDomElement element = dnList.item(i).toElement();
LogSensor* sensor = new LogSensor(monitor); LogSensor* sensor = new LogSensor(monitor);
Q_CHECK_PTR(sensor); TQ_CHECK_PTR(sensor);
sensor->setHostName(element.attribute("hostName")); sensor->setHostName(element.attribute("hostName"));
sensor->setSensorName(element.attribute("sensorName")); sensor->setSensorName(element.attribute("sensorName"));

2
ktip/ktipwindow.cpp
Unescape View File

@ -45,7 +45,7 @@ int main(int argc, char *argv[])
KUniqueApplication app; KUniqueApplication app;
KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("kdewizard/tips")))); KTipDialog *tipDialog = new KTipDialog(new KTipDatabase(locate("data", TQString("kdewizard/tips"))));
Q_CHECK_PTR(tipDialog); TQ_CHECK_PTR(tipDialog);
#ifdef Q_WS_X11 #ifdef Q_WS_X11
KWin::setState(tipDialog->winId(), NET::StaysOnTop); KWin::setState(tipDialog->winId(), NET::StaysOnTop);
#endif #endif

2
libkonq/konq_historymgr.cc
Unescape View File

@ -150,7 +150,7 @@ bool KonqHistoryManager::loadHistory()
while ( !stream->atEnd() ) { while ( !stream->atEnd() ) {
KonqHistoryEntry *entry = new KonqHistoryEntry; KonqHistoryEntry *entry = new KonqHistoryEntry;
Q_CHECK_PTR( entry ); TQ_CHECK_PTR( entry );
*stream >> *entry; *stream >> *entry;
// kdDebug(1203) << "## loaded entry: " << entry->url << ", Title: " << entry->title << endl; // kdDebug(1203) << "## loaded entry: " << entry->url << ", Title: " << entry->title << endl;
m_history.append( entry ); m_history.append( entry );

2
nsplugins/viewer/kxt.cpp
Unescape View File

@ -45,7 +45,7 @@
*****************************************************************************/ *****************************************************************************/
#include <tqglobal.h> #include <tqglobal.h>
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
#include <kapplication.h> #include <kapplication.h>
#include <tqwidget.h> #include <tqwidget.h>

2
nsplugins/viewer/kxt.h
Unescape View File

@ -47,7 +47,7 @@
#define KXT_H #define KXT_H
#include <tqglobal.h> #include <tqglobal.h>
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
#include <kapplication.h> #include <kapplication.h>
#include <tqwidget.h> #include <tqwidget.h>

2
nsplugins/viewer/nsplugin.cpp
Unescape View File

@ -1292,7 +1292,7 @@ void NSPluginViewer::shutdown()
{ {
kdDebug(1431) << "NSPluginViewer::shutdown" << endl; kdDebug(1431) << "NSPluginViewer::shutdown" << endl;
_classes.clear(); _classes.clear();
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
quitXt(); quitXt();
#else #else
tqApp->quit(); tqApp->quit();

2
nsplugins/viewer/qxteventloop.cpp
Unescape View File

@ -37,7 +37,7 @@
#include "qxteventloop.h" #include "qxteventloop.h"
#if QT_VERSION >= 0x030100 #if TQT_VERSION >= 0x030100
#include <tqapplication.h> #include <tqapplication.h>
#include <tqwidgetintdict.h> #include <tqwidgetintdict.h>

2
nsplugins/viewer/qxteventloop.h
Unescape View File

@ -38,7 +38,7 @@
#include <tqglobal.h> #include <tqglobal.h>
// #if QT_VERSION >= 0x030100 // #if TQT_VERSION >= 0x030100
#include <tqeventloop.h> #include <tqeventloop.h>

8
nsplugins/viewer/viewer.cpp
Unescape View File

@ -46,7 +46,7 @@
#endif #endif
#include <kconfig.h> #include <kconfig.h>
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
#include "kxt.h" #include "kxt.h"
#include <X11/Intrinsic.h> #include <X11/Intrinsic.h>
#include <X11/Shell.h> #include <X11/Shell.h>
@ -103,7 +103,7 @@ void parseCommandLine(int argc, char *argv[])
} }
} }
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
static XtAppContext g_appcon; static XtAppContext g_appcon;
static bool g_quit = false; static bool g_quit = false;
@ -227,7 +227,7 @@ int main(int argc, char** argv)
kdDebug(1430) << "2 - parseCommandLine" << endl; kdDebug(1430) << "2 - parseCommandLine" << endl;
parseCommandLine(argc, argv); parseCommandLine(argc, argv);
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
// Create application // Create application
kdDebug(1430) << "3 - XtToolkitInitialize" << endl; kdDebug(1430) << "3 - XtToolkitInitialize" << endl;
XtToolkitInitialize(); XtToolkitInitialize();
@ -298,7 +298,7 @@ int main(int argc, char** argv)
NSPluginViewer *viewer = new NSPluginViewer( "viewer", 0 ); NSPluginViewer *viewer = new NSPluginViewer( "viewer", 0 );
// start main loop // start main loop
#if QT_VERSION < 0x030100 #if TQT_VERSION < 0x030100
kdDebug(1430) << "8 - XtAppProcessEvent" << endl; kdDebug(1430) << "8 - XtAppProcessEvent" << endl;
while (!g_quit) while (!g_quit)
XtAppProcessEvent( g_appcon, XtIMAll); XtAppProcessEvent( g_appcon, XtIMAll);

2
twin/workspace.cpp
Unescape View File

@ -208,7 +208,7 @@ Workspace::Workspace( bool restore )
init(); init();
#if (QT_VERSION-0 >= 0x030200) // XRANDR support #if (TQT_VERSION-0 >= 0x030200) // XRANDR support
connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized()));
#endif #endif

Write Preview
Loading…
Cancel
Save