Minor compilation enhancements

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1216418 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 0406f543f8
commit d53bf36090

@ -19,12 +19,15 @@
#ifndef __THEMEPAGE_H #ifndef __THEMEPAGE_H
#define __THEMEPAGE_H #define __THEMEPAGE_H
#include <tqwidget.h>
class KListView; class KListView;
class TQListViewItem; class TQListViewItem;
class ThemePage : public TQWidget class ThemePage : public TQWidget
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT
public: public:
ThemePage( TQWidget* parent = 0, const char* name = 0 ); ThemePage( TQWidget* parent = 0, const char* name = 0 );

@ -99,7 +99,7 @@
</vbox> </vbox>
</widget> </widget>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">action_group_name_changed( const QString&amp; )</slot> <slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString&amp; )</slot>
</Q_SLOTS> </Q_SLOTS>
<layoutdefaults spacing="6" margin="11"/> <layoutdefaults spacing="6" margin="11"/>
<includehints> <includehints>

@ -119,8 +119,8 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
<signal>currentChanged(QListViewItem*)</signal> <signal>currentChanged(TQListViewItem*)</signal>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<images> <images>
@ -149,17 +149,17 @@
</connection> </connection>
<connection> <connection>
<sender>actions_listview</sender> <sender>actions_listview</sender>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
<receiver>Action_list_widget_ui</receiver> <receiver>Action_list_widget_ui</receiver>
<slot>current_changed(QListViewItem*)</slot> <slot>current_changed(TQListViewItem*)</slot>
</connection> </connection>
</connections> </connections>
<forwards> <forwards>
<forward>class QListViewItem;</forward> <forward>class TQListViewItem;</forward>
</forwards> </forwards>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
</Q_SLOTS> </Q_SLOTS>

@ -119,7 +119,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<images> <images>
@ -148,17 +148,17 @@
</connection> </connection>
<connection> <connection>
<sender>conditions_listview</sender> <sender>conditions_listview</sender>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
<receiver>Condition_list_widget_ui</receiver> <receiver>Condition_list_widget_ui</receiver>
<slot>current_changed(QListViewItem*)</slot> <slot>current_changed(TQListViewItem*)</slot>
</connection> </connection>
</connections> </connections>
<forwards> <forwards>
<forward>class QListViewItem;</forward> <forward>class TQListViewItem;</forward>
</forwards> </forwards>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
</Q_SLOTS> </Q_SLOTS>

@ -134,7 +134,7 @@
</vbox> </vbox>
</widget> </widget>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">action_name_changed( const QString&amp; )</slot> <slot access="protected" specifier="pure virtual">action_name_changed( const TQString&amp; )</slot>
<slot access="protected" specifier="pure virtual">action_type_changed(int)</slot> <slot access="protected" specifier="pure virtual">action_type_changed(int)</slot>
</Q_SLOTS> </Q_SLOTS>
<includes> <includes>

@ -119,8 +119,8 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
<signal>currentChanged(QListViewItem*)</signal> <signal>currentChanged(TQListViewItem*)</signal>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<images> <images>
@ -149,17 +149,17 @@
</connection> </connection>
<connection> <connection>
<sender>triggers_listview</sender> <sender>triggers_listview</sender>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
<receiver>Triggers_tab_ui</receiver> <receiver>Triggers_tab_ui</receiver>
<slot>current_changed(QListViewItem*)</slot> <slot>current_changed(TQListViewItem*)</slot>
</connection> </connection>
</connections> </connections>
<forwards> <forwards>
<forward>class QListViewItem;</forward> <forward>class TQListViewItem;</forward>
</forwards> </forwards>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
</Q_SLOTS> </Q_SLOTS>

@ -119,7 +119,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<images> <images>
@ -148,9 +148,9 @@
</connection> </connection>
<connection> <connection>
<sender>windows_listview</sender> <sender>windows_listview</sender>
<signal>current_changed(QListViewItem*)</signal> <signal>current_changed(TQListViewItem*)</signal>
<receiver>Windowdef_list_widget_ui</receiver> <receiver>Windowdef_list_widget_ui</receiver>
<slot>current_changed(QListViewItem*)</slot> <slot>current_changed(TQListViewItem*)</slot>
</connection> </connection>
</connections> </connections>
<forwards> <forwards>
@ -158,7 +158,7 @@
</forwards> </forwards>
<Q_SLOTS> <Q_SLOTS>
<slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">copy_pressed()</slot>
<slot access="protected" specifier="pure virtual">current_changed(QListViewItem*)</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot>
<slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot>
<slot access="protected" specifier="pure virtual">modify_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
</Q_SLOTS> </Q_SLOTS>

@ -755,7 +755,7 @@ void TOM::paintEvent(TQPaintEvent * e)
TQPainter p(this); TQPainter p(this);
style().drawPrimitive( TQStyle::PE_PanelPopup, &p, tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ), TQRect( 0, 0, width(), height() ),
tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) ); TQStyleOption( frameWidth(), 0 ) );

@ -550,7 +550,7 @@ char *MANProtocol::readManPage(const char *_filename)
const TQCString cstr=myStdStream.latin1(); const TQCString cstr=myStdStream.latin1();
const int len = cstr.size()-1; const int len = cstr.size()-1;
buf = new char[len + 4]; buf = new char[len + 4];
qmemmove(buf + 1, cstr.data(), len); tqmemmove(buf + 1, cstr.data(), len);
buf[0]=buf[len]='\n'; // Start and end with a end of line buf[0]=buf[len]='\n'; // Start and end with a end of line
buf[len+1]=buf[len+2]='\0'; // Two additional NUL characters at end buf[len+1]=buf[len+2]='\0'; // Two additional NUL characters at end
} }
@ -582,7 +582,7 @@ char *MANProtocol::readManPage(const char *_filename)
const TQCString cstr=myStdStream.utf8(); const TQCString cstr=myStdStream.utf8();
const int len = cstr.size()-1; const int len = cstr.size()-1;
buf = new char[len + 4]; buf = new char[len + 4];
qmemmove(buf + 1, cstr.data(), len); tqmemmove(buf + 1, cstr.data(), len);
buf[0]=buf[len]='\n'; // Start and end with a end of line buf[0]=buf[len]='\n'; // Start and end with a end of line
buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
} }

@ -56,7 +56,7 @@ void ThemeListBox::dropEvent(TQDropEvent* event)
void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p) void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const TQPoint &p)
{ {
if ((button & LeftButton) == 0) return; if ((button & Qt::LeftButton) == 0) return;
mOldPos = p; mOldPos = p;
mDragFile = TQString::null; mDragFile = TQString::null;
int cur = index(item); int cur = index(item);
@ -66,7 +66,7 @@ void ThemeListBox::slotMouseButtonPressed(int button, TQListBoxItem *item, const
void ThemeListBox::mouseMoveEvent(TQMouseEvent *e) void ThemeListBox::mouseMoveEvent(TQMouseEvent *e)
{ {
if (((e->state() & LeftButton) != 0) && !mDragFile.isEmpty()) if (((e->state() & Qt::LeftButton) != 0) && !mDragFile.isEmpty())
{ {
int delay = KGlobalSettings::dndEventDelay(); int delay = KGlobalSettings::dndEventDelay();
TQPoint newPos = e->globalPos(); TQPoint newPos = e->globalPos();

@ -22,7 +22,7 @@ class TQTextEdit;
class TQPushButton; class TQPushButton;
class ThemeListBox; class ThemeListBox;
class SplashInstaller : public QWidget class SplashInstaller : public TQWidget
{ {
Q_OBJECT Q_OBJECT
public: public:

@ -38,7 +38,7 @@
// KSplash::KSplash(): This is a hidden object. Its sole purpose // KSplash::KSplash(): This is a hidden object. Its sole purpose
// is to manage the other objects, which are presented on the screen. // is to manage the other objects, which are presented on the screen.
KSplash::KSplash(const char *name) KSplash::KSplash(const char *name)
: DCOPObject( name ), TQWidget( 0, name, WStyle_Customize|WStyle_NoBorder|WX11BypassWM ), : DCOPObject( name ), TQWidget( 0, name, (WFlags)(WStyle_Customize|WStyle_NoBorder|WX11BypassWM) ),
mState( 0 ), mMaxProgress( 0 ), mStep( 0 ) mState( 0 ), mMaxProgress( 0 ), mStep( 0 )
{ {
hide(); // We never show this object. hide(); // We never show this object.
@ -381,7 +381,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
{ {
TQStringList themeTitle; TQStringList themeTitle;
themeTitle << theme; themeTitle << theme;
return static_cast<ThemeEngine *>(factory->create(this, "theme", objName.latin1(), themeTitle)); return static_cast<ThemeEngine *>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "theme", objName.latin1(), themeTitle)));
} }
else else
return 0L; return 0L;
@ -416,7 +416,7 @@ TQPtrList<Action> KSplash::actionList()
bool KSplash::eventFilter( TQObject *o, TQEvent *e ) bool KSplash::eventFilter( TQObject *o, TQEvent *e )
{ {
if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) ) if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(mThemeEngine) ) )
{ {
TQTimer::singleShot( 0, this, TQT_SLOT(close())); TQTimer::singleShot( 0, this, TQT_SLOT(close()));
return TRUE; return TRUE;

@ -1,6 +1,6 @@
#ifndef NOSLOTS #ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \ # define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) keys->insert( name, i18n(name), TQString(), key3, key4, TQT_TQOBJECT(this), TQT_SLOT(fnSlot) )
#else #else
# define DEF( name, key3, key4, fnSlot ) \ # define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 ) keys->insert( name, i18n(name), TQString(), key3, key4 )

Loading…
Cancel
Save