Branch: master

3335f33f 2014-10-23 00:25:11 Timothy Pearson
Fix FTBFS due to accidental double quote duplication
M kaffeine/src/input/audiobrowser/playlist.cpp
M kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
M kaffeine/src/player-parts/xine-part/filterdialog.cpp
M kaffeine/src/pref.cpp
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 01949d4..ee841d3 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -419,7 +419,7 @@
 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
 
 	m_isCurrentEntry = UserIcon("playing");
-	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon(""application-x-cda", TDEIcon::Small);
+	m_cdPixmap = TDEGlobal::iconLoader()->loadIcon("application-x-cda", TDEIcon::Small);
 
 	setXMLFile("kaffeineplaylist.rc");
 	setupActions();
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index 1981e55..fa7369f 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -44,7 +44,7 @@
 	TQLabel* label = NULL;
 
 	//Audio Page
-	frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon(""audio-x-generic", TDEIcon::Panel,
+	frame = addPage(i18n("Audio"), i18n("Audio Options"), TDEGlobal::iconLoader()->loadIcon("audio-x-generic", TDEIcon::Panel,
 	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
@@ -57,7 +57,7 @@
 	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
 
 	//Video Page
-	frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon(""video-x-generic", TDEIcon::Panel,
+	frame = addPage(i18n("Video"), i18n("Video Options"), TDEGlobal::iconLoader()->loadIcon("video-x-generic", TDEIcon::Panel,
 	                TDEIcon::SizeMedium));
 	layout = new TQGridLayout(frame, 10, 2);
 	layout->setMargin(10);
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
index dd2312b..3a1bfb8 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
@@ -43,7 +43,7 @@
 
 /****** Audio Filters ******/  
   TQWidget* audioPage = addPage(i18n("Audio"), i18n("Audio Filters"),
-           TDEGlobal::iconLoader()->loadIcon(""audio-x-generic", TDEIcon::Panel, TDEIcon::SizeMedium));
+           TDEGlobal::iconLoader()->loadIcon("audio-x-generic", TDEIcon::Panel, TDEIcon::SizeMedium));
   TQGridLayout* audioGrid = new TQGridLayout( audioPage, 3, 3 );
   audioGrid->setSpacing( 5 );
 
@@ -76,7 +76,7 @@
   
 /****** Video Filters ******/  
   TQWidget* videoPage = addPage(i18n("Video"), i18n("Video Filters"),
-           TDEGlobal::iconLoader()->loadIcon(""video-x-generic", TDEIcon::Panel, TDEIcon::SizeMedium));
+           TDEGlobal::iconLoader()->loadIcon("video-x-generic", TDEIcon::Panel, TDEIcon::SizeMedium));
   TQGridLayout* videoGrid = new TQGridLayout( videoPage, 3, 3 );
   videoGrid->setSpacing( 5 );
 
diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
index 0aaec48..1de9dac 100644
--- a/kaffeine/src/pref.cpp
+++ b/kaffeine/src/pref.cpp
@@ -123,7 +123,7 @@
 	vb->addItem( new TQSpacerItem( 20, 20, TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
 
 //-----------misc----------------
-	TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon(""misc", TDEIcon::Panel, TDEIcon::SizeMedium));
+	TQFrame *misc = addPage(i18n("Misc"), i18n("Miscellaneous Options"),TDEGlobal::iconLoader()->loadIcon("misc", TDEIcon::Panel, TDEIcon::SizeMedium));
 	vb = new TQVBoxLayout( misc, 6, 6 );
 	gb = new TQGroupBox(1, Qt::Horizontal, "", misc);
 	gb->setInsideMargin(20);