diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index ea530d56..d1bf024d 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -361,7 +361,7 @@ void KRandRSystemTray::populateMenu(KMenu* menu)
 					if (screen->activeCount() != 1)
 					{
 						action = outputMenu->addAction(i18n("Disable"));
-						if (output->crtc() == None)
+						if (!output->crtc())
 						{
 							QFont font = action->font();
 							font.setBold(true);
diff --git a/libs/oxygen/oxygenhelper.cpp b/libs/oxygen/oxygenhelper.cpp
index ee1dd4c9..52b25231 100644
--- a/libs/oxygen/oxygenhelper.cpp
+++ b/libs/oxygen/oxygenhelper.cpp
@@ -1090,7 +1090,7 @@ namespace Oxygen
             &data);
 
         // finish if no data is found
-        if( data == None || n != 1 ) return false;
+        if( data == NULL || n != 1 ) return false;
         else return *data;
 
     }