summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/clock/digital.ui4
-rw-r--r--kicker/applets/clock/settings.ui5
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp4
-rw-r--r--kicker/extensions/kasbar/kasitem.h1
-rw-r--r--kicker/libkicker/panelbutton.cpp1
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp2
6 files changed, 10 insertions, 7 deletions
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index ab90a6438..fc2b66cac 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -292,9 +292,9 @@
<include location="local" impldecl="in implementation">kfontrequester.h</include>
<include location="local" impldecl="in implementation">digital.ui.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
-</slots>
+</Q_SLOTS>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 53e9c80cd..6cf1d30f0 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -495,12 +495,13 @@
<tabstop>tzListView</tabstop>
</tabstops>
<includes>
+ <include location="local" impldecl="in implementation">tqheader.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
<include location="local" impldecl="in implementation">kfontrequester.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>configureType()</slot>
-</slots>
+</Q_SLOTS>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 3360b95cb..17cbfb967 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -88,7 +88,7 @@ int main( int argc, char **argv )
KConfig conf( "kasbarrc" );
if ( args->isSet("test") ) {
- kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+ kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
kasbar->setItemSize( KasBar::Large );
kasbar->append( new KasClockItem(kasbar) );
kasbar->append( new KasItem(kasbar) );
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
kasbar->addTestItems();
}
else {
- KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+ KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQ_WFlags)wflags );
kastasker->setConfig( &conf );
kastasker->setStandAlone( true );
kasbar = kastasker;
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 08f5436d4..66cecf9ac 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -64,6 +64,7 @@ class KasPopup;
#include <tqguardedptr.h>
#include <tqpoint.h>
#include <tqvaluevector.h>
+#include <tqapplication.h>
#include <kdemacros.h>
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 0edae6987..4d61566b2 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -21,6 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
+#undef None // Qt4
#include <tqcursor.h>
#include <tqfile.h>
#include <tqfontmetrics.h>
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 837a7fcec..eed255b64 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tasklmbmenu.moc"
#include <tqpainter.h>
-#include <tqstyle.h>
+//#include <tqstyle.h>
#include <kdebug.h>
#include <kglobalsettings.h>