fix conflicts

amdpstateeditor.cpp

@@ -6,13 +6,6 @@ amdPstateEditor::amdPstateEditor(QWidget *parent) :
     ui(new Ui::amdPstateEditor)
 {
     ui->setupUi(this);
-<<<<<<< HEAD
-    //amdptr = new amd;
-    //types = amdptr;
-    //generateUI();
-
-=======
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
 }
 
 amdPstateEditor::~amdPstateEditor()

amdpstateeditor.h

@@ -3,20 +3,12 @@
 
 #include <QDialog>
 #include <QWidget>
-<<<<<<< HEAD
 #include <QSlider>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <QSpinBox>
 #include <QLabel>
 #include "gputypes.h"
-=======
-#include "gputypes.h"
-#include <QLabel>
-#include <QSlider>
-#include <QSpinBox>
-#include <QLayout>
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
 
 namespace Ui {
 class amdPstateEditor;
@@ -29,19 +21,10 @@ class amdPstateEditor : public QDialog
 public:
     explicit amdPstateEditor(QWidget *parent = nullptr);
     ~amdPstateEditor();
-<<<<<<< HEAD
-public slots:
-=======
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
     void generateUI(gputypes *types);
 
 private:
     Ui::amdPstateEditor *ui;
-<<<<<<< HEAD
-    //gputypes *types;
-    //amd *amdptr;
-=======
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
 };
 
 #endif // AMDPSTATEEDITOR_H

amdpstateeditor.ui

@@ -6,13 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-<<<<<<< HEAD
     <width>713</width>
     <height>550</height>
-=======
     <width>600</width>
     <height>428</height>
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
    </rect>
   </property>
   <property name="windowTitle">

mainwindow.cpp

@@ -1108,17 +1108,11 @@ void MainWindow::on_GPUComboBox_currentIndexChanged(int index)
     curmaxclk->setText(1, QString::number(types->GPUList[index].maxCoreClk) + "MHz");
 }
 
-<<<<<<< HEAD
+
 void MainWindow::on_amdPstateButton_pressed()
 {
     amdPstateEditor *ps = new amdPstateEditor;
     ps->generateUI(types);
-    ps->setModal(false);
-=======
-void MainWindow::on_pstateButton_clicked()
-{
-    amdPstateEditor *ps = new amdPstateEditor;
-    ps->generateUI(types);
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
+    ps->setModal(true);
     ps->exec();
 }

mainwindow.h

@@ -3,10 +3,12 @@
 
 #include <QMainWindow>
 #include "editprofile.h"
+#include "newprofile.h"
 #include <QProcess>
 #include <QList>
 #include <QByteArray>
 #include "gputypes.h"
+#include "plotwidget.h"
 #ifdef AMD
 #include "amdpstateeditor.h"
 #endif
@@ -152,11 +154,8 @@ private slots:
 
     void on_GPUComboBox_currentIndexChanged(int index);
 
-<<<<<<< HEAD
+
     void on_amdPstateButton_pressed();
-=======
-    void on_pstateButton_clicked();
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
 
 private:
     Ui::MainWindow *ui;

mainwindow.ui

@@ -174,11 +174,7 @@
          </widget>
         </item>
         <item row="0" column="5">
-<<<<<<< HEAD
          <widget class="QPushButton" name="amdPstateButton">
-=======
-         <widget class="QPushButton" name="pstateButton">
->>>>>>> 09ca6b3c9f828481d3690c9999546c2d9785d9bd
           <property name="text">
            <string>Edit Pstates</string>
           </property>